New lock code, credit to Clark Van Oyen (https://github.com/countable) (

#257)

* Create file lock per office, to limit lock contention
Put in one error check in the citizen_list endpoint
- Thanks to Clark Van Oyen (https://github.com/countable) for this code
* Add error check to POST as well as GET to /citizens/ endpoint
Update the version number

api/app/resources/theq/citizen/citizen_begin_service.py

@@ -28,10 +28,10 @@ class CitizenBeginService(Resource):
     @oidc.accept_token(require_token=True)
     @api_call_with_retry
     def post(self, id):
-        lock = FileLock("lock/begin_citizen.lock")
+        csr = CSR.find_by_username(g.oidc_token_info['username'])
+        lock = FileLock("lock/begin_citizen_{}.lock".format(csr.office_id))
 
         with lock:
-            csr = CSR.find_by_username(g.oidc_token_info['username'])
             citizen = Citizen.query.filter_by(citizen_id=id, office_id=csr.office_id).first()
             pending_service_state = SRState.get_state_by_name("Active")
 

api/app/resources/theq/citizen/citizen_generic_invite.py

@@ -29,10 +29,10 @@ class CitizenGenericInvite(Resource):
     @api_call_with_retry
     def post(self):
 
-        lock = FileLock("lock/invite_citizen.lock")
+        csr = CSR.find_by_username(g.oidc_token_info['username'])
+        lock = FileLock("lock/invite_citizen_{}.lock".format(csr.office_id))
 
         with lock:
-            csr = CSR.find_by_username(g.oidc_token_info['username'])
 
             active_citizen_state = CitizenState.query.filter_by(cs_state_name='Active').first()
             waiting_period_state = PeriodState.get_state_by_name("Waiting")

api/app/resources/theq/citizen/citizen_list.py

@@ -32,6 +32,8 @@ class CitizenList(Resource):
     def get(self):
         try:
             csr = CSR.find_by_username(g.oidc_token_info['username'])
+            if not csr:
+                raise Exception('no user found with username: `{}`'.format(g.oidc_token_info['username']))
             active_state = CitizenState.query.filter_by(cs_state_name="Active").first()
             citizens = Citizen.query.filter_by(office_id=csr.office_id, cs_id=active_state.cs_id) \
                 .order_by(Citizen.priority) \
@@ -47,9 +49,12 @@ def get(self):
     @oidc.accept_token(require_token=True)
     @api_call_with_retry
     def post(self):
+
         json_data = request.get_json()
 
         csr = CSR.find_by_username(g.oidc_token_info['username'])
+        if not csr:
+            raise Exception('no user found with username: `{}`'.format(g.oidc_token_info['username']))
 
         try:
             citizen = self.citizen_schema.load(json_data).data

api/app/resources/theq/citizen/citizen_specific_invite.py

@@ -29,10 +29,10 @@ class CitizenSpecificInvite(Resource):
     @oidc.accept_token(require_token=True)
     @api_call_with_retry
     def post(self, id):
-        lock = FileLock("lock/invite_citizen.lock")
+        csr = CSR.find_by_username(g.oidc_token_info['username'])
+        lock = FileLock("lock/invite_citizen_{}.lock".format(csr.office_id))
 
         with lock:
-            csr = CSR.find_by_username(g.oidc_token_info['username'])
             citizen = db.session.query(Citizen).with_lockmode('update').filter_by(citizen_id=id).first()
             active_service_state = SRState.get_state_by_name("Active")
 

frontend/src/layout/footer.vue

@@ -24,7 +24,7 @@
           <a href="#" @click="keycloakLogin()" id="keycloak-login">Keycloak Login</a>
         </div>
         <div class="footer-anchor-item-last" style="display:inline-block; color: white; margin-right:15px;">
-          v1.0.25
+          v1.0.26
         </div>
       </div>
     </div>