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

Add building status

.github/workflows/cicd.yml

@@ -37,16 +37,16 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install Dependencies
         run: |
@@ -75,16 +75,16 @@ jobs:
 
     needs: test
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
-          python-version: '3.x'
+          python-version: 3.8
 
       - name: Publish to PyPi
         uses: uw-it-aca/actions/publish-pypi@main

setup.py

@@ -1,3 +1,6 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 from setuptools import setup
 
@@ -35,6 +38,6 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.8',
     ],
 )

uw_space/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -49,9 +49,11 @@ def __process_json(self, json_data):
         objs = []
         facilitys = json_data.get("Facilitys")
         for facility in facilitys:
+            status = facility.get("Status")
             fnumber = facility.get("FacilityNumber")
             if fnumber and len(fnumber):
                 fac = self.search_by_number(fnumber)
                 if fac:
+                    fac.status = status
                     objs.append(fac)
         return objs

uw_space/dao.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

uw_space/models.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -16,6 +16,7 @@ class Facility(models.Model):
     number = models.CharField(max_length=16)
     type = models.CharField(max_length=32)
     site = models.CharField(max_length=96)
+    status = models.CharField(max_length=64)
 
     def __init__(self, *args, **kwargs):
         super(Facility, self).__init__(*args, **kwargs)
@@ -27,7 +28,6 @@ def from_json(json_data):
         obj.number = json_data.get("FacilityNumber")
         obj.last_updated = str_to_datetime(json_data.get("ModifiedDate"))
         obj.name = json_data.get("LongName")
-
         cpoint = json_data.get("CenterPoint")
         if cpoint:
             obj.latitude = cpoint.get("Latitude")
@@ -51,6 +51,7 @@ def json_data(self):
             "name": self.name,
             "number": self.number,
             "site": self.site,
+            "status": self.status,
             "type": self.type,
         }
 

uw_space/test.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

uw_space/tests/test_dao.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

uw_space/tests/test_facilities.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -24,6 +24,7 @@ class TestSpace(TestCase):
     def test_search_by_code(self):
         fac = Facilities().search_by_code("MEB")
         self.assertEqual(len(fac), 1)
+        data['status'] = 'A'
         self.assertEqual(fac[0].json_data(), data)
 
         self.assertRaises(
@@ -33,6 +34,7 @@ def test_search_by_code(self):
 
     def test_search_by_number(self):
         fac = Facilities().search_by_number("1347")
+        data['status'] = ''
         self.assertEqual(fac.json_data(), data)
 
         self.assertRaises(

uw_space/utils.py

@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0