Merge pull request #5 from uw-it-aca/qa

refine code
uw-it-aca · Nov 16, 2021 · f1ae82e · f1ae82e
2 parents 17317de + f3b99fe
commit f1ae82e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/uw_space/__init__.py b/uw_space/__init__.py
@@ -16,7 +16,9 @@ class Facilities(object):
 
     def __init__(self):
         self.dao = SPACE_DAO()
-        self._read_headers = {"Accept": "application/json"}
+        self._read_headers = {
+            'Accept': 'application/json',
+            'Connection': 'keep-alive'}
 
     def search_by_code(self, facility_code):
         """
@@ -46,13 +48,9 @@ def __process_json(self, json_data):
         objs = []
         facilitys = json_data.get("Facilitys")
         for facility in facilitys:
-            furi = facility.get("FacilityURI")
-            if furi:
-                url = furi.get("Href")
-                building_resp = self.dao.getURL(url, self._read_headers)
-                if building_resp.status != 200:
-                    raise DataFailureException(
-                        url, building_resp.status, building_resp.data)
-                objs.append(
-                    Facility.from_json(json.loads(building_resp.data)))
+            fnumber = facility.get("FacilityNumber")
+            if fnumber and len(fnumber):
+                fac = self.search_by_number(fnumber)
+                if fac:
+                    objs.append(fac)
         return objs
diff --git a/uw_space/models.py b/uw_space/models.py
@@ -7,12 +7,12 @@
 
 
 class Facility(models.Model):
-    code = models.CharField(max_length=32)
+    code = models.CharField(max_length=16)
     last_updated = models.DateTimeField()
-    latitude = models.CharField(max_length=64)
-    longitude = models.CharField(max_length=64)
-    name = models.CharField(max_length=128)
-    number = models.CharField(max_length=32)
+    latitude = models.CharField(max_length=32)
+    longitude = models.CharField(max_length=32)
+    name = models.CharField(max_length=96)
+    number = models.CharField(max_length=16)
     type = models.CharField(max_length=32)
     site = models.CharField(max_length=96)