eqs

Controller/EquipmentOTA.py

@@ -147,14 +147,14 @@ class EquipmentVersionView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.GET,  operation)
+        return self.validation(request.GET, operation)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.POST,  operation)
+        return self.validation(request.POST, operation)
 
-    def validation(self, request_dict,  operation):
+    def validation(self, request_dict, operation):
         response = ResponseObject()
         if operation is None:
             return response.json(444, 'error path')
@@ -181,9 +181,8 @@ class EquipmentVersionView(View):
         uid = request_dict.get('uid', None)
         if not code:
             return response.json(444, 'code')
-        if uid is not None:
-            eqs = Equipment_Version.objects.filter(code=uid, status=1, lang='en').order_by('-data_joined')
-        else:
+        eqs = Equipment_Version.objects.filter(code=uid, status=1, lang='en').order_by('-data_joined')
+        if not eqs.exclude():
             eqs = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
         if not eqs.exists():
             return response.json(900)
@@ -205,9 +204,9 @@ class EquipmentVersionView(View):
             "url": urls,
             "fileSize": eqs[0].fileSize,
             "Description": eqs[0].Description,
-            "softwareVersion":eqs[0].softwareVersion
+            "softwareVersion": eqs[0].softwareVersion
         }
-        return response.json(0,res)
+        return response.json(0, res)
 
     def do_query(self, request_dict, response):
         mci = request_dict.get('mci', None)