Merge branch 'master' into access-token

Author: kaesrel

app/app.py

@@ -374,8 +374,9 @@ def update_citizen_db():
 
     citizen_id = request.values['citizen_id']
     vaccine_name = request.values['vaccine_name']
+    option = request.values['option']
 
-    if not (citizen_id and vaccine_name):
+    if not (citizen_id and vaccine_name and option):
         logger.error(REPORT_FEEDBACK["missing_key"])
         return {"feedback": REPORT_FEEDBACK["missing_key"]}
 
@@ -391,32 +392,29 @@ def update_citizen_db():
         logger.error(REPORT_FEEDBACK["invalid_vaccine"])
         return {"feedback": REPORT_FEEDBACK["invalid_vaccine"]}
 
-    try:
-        option = request.values['option']
-        if (option == "walk-in"):
-            if is_reserved(citizen_id):
-                logger.error(REPORT_FEEDBACK["has_reservation"])
-                return {"feedback": REPORT_FEEDBACK["has_reservation"]}
-
-            try:
-                citizen = get_citizen(citizen_id)
-                is_valid, feedback = validate_vaccine(citizen, vaccine_name)
-
-                if not is_valid:
-                    logger.error("{} - {}".format(citizen_id,
-                                                  feedback['feedback']))
-                    return feedback
-
-                citizen.vaccine_taken = [
-                    *(citizen.vaccine_taken), vaccine_name
-                ]
-                db.session.commit()
-
-            except:
-                db.session.rollback()
-                logger.error(REPORT_FEEDBACK["other"])
-                return {"feedback": REPORT_FEEDBACK["other"]}
-    except:
+    if (option == "walk-in"):
+        if is_reserved(citizen_id):
+            logger.error(REPORT_FEEDBACK["has_reservation"])
+            return {"feedback": REPORT_FEEDBACK["has_reservation"]}
+        try:
+            citizen = get_citizen(citizen_id)
+            is_valid, feedback = validate_vaccine(citizen, vaccine_name)
+            if not is_valid:
+                logger.error("{} - {}".format(citizen_id,
+                                              feedback['feedback']))
+                return feedback
+            citizen.vaccine_taken = [*(citizen.vaccine_taken), vaccine_name]
+            db.session.commit()
+        except:
+            db.session.rollback()
+            logger.error(REPORT_FEEDBACK["other"])
+            return {"feedback": REPORT_FEEDBACK["other"]}
+
+        logger.info("{} - updated citizen - vaccine name: {}".format(
+            citizen_id, vaccine_name))
+        return {"feedback": REPORT_FEEDBACK["success"]}
+
+    elif (option == "reserve"):
         if not is_reserved(citizen_id):
             logger.error(REPORT_FEEDBACK["not_reservation"])
             return {"feedback": REPORT_FEEDBACK["not_reservation"]}
@@ -426,19 +424,22 @@ def update_citizen_db():
             citizen_data.vaccine_taken = [
                 *(citizen_data.vaccine_taken), vaccine_name
             ]
-            reservation_data = get_unchecked_reservations(
-                db, citizen_id).filter(
-                    Reservation.vaccine_name == vaccine_name).first()
+            reservation_data = get_unchecked_reservations(citizen_id).filter(
+                Reservation.vaccine_name == vaccine_name).first()
             reservation_data.checked = True
             db.session.commit()
         except:
             db.session.rollback()
             logger.error(REPORT_FEEDBACK["not_match_vaccine"])
             return {"feedback": REPORT_FEEDBACK["not_match_vaccine"]}
 
-    logger.info("{} - updated citizen - vaccine name: {}".format(
-        citizen_id, vaccine_name))
-    return {"feedback": REPORT_FEEDBACK["success"]}
+        logger.info("{} - updated citizen - vaccine name: {}".format(
+            citizen_id, vaccine_name))
+        return {"feedback": REPORT_FEEDBACK["success"]}
+
+    else:
+        logger.error(REPORT_FEEDBACK["invalid_option"])
+        return {"feedback": REPORT_FEEDBACK["invalid_option"]}
 
 @app.route('/register_user', methods=['POST'])
 @cross_origin()

app/feedback.py

@@ -39,6 +39,7 @@
     'has_reservation':      'report failed: before walk-in, citizen need to cancel other reservation',
     'not_reservation':      'report failed: there is no reservation for this citizen',
     'not_match_vaccine':    'report failed: vaccine_name not match reservation',
+    'invalid_option':       'report failed: option need to be neither "reserve" or "walk-in"',
     'other':                'report failed: something go wrong, please contact admin'
 }
 

app/swagger/regispost.yml

@@ -38,7 +38,7 @@ parameters:
     required: true
   - name: "is_risk"
     in: formData
-    description: "inform that this citizen is in the risk category or not can either be True or False"
+    description: "inform that this citizen is in the risk category or not can either be 'true' or 'false'"
     type: "string"
     required: true
   - name: "address"

app/templates/registration.html

@@ -58,12 +58,6 @@ <h5>This API is to register citizen information</h5>
             <li>birth_date: citizen must be at least 12 years old</li>
         </ul>
 
-        <p>[DELETE] <a href="/registration">/registration</a> - Delete all citizen data and all of his reservations</p>
-        <ul>
-            <li>Error only show for admin (logging)</li>
-            <li>Redirect to <a href="/database/citizen"> Citizen Database</a></li>
-        </ul>
-
         <p>[DELETE] <a href="/registration/<citizen_id>">/registration/[citizen_id]</a> - Delete this citizen data and all of the reservations</p>
         <ul>
             <li>Error only show for admin (logging)</li>

app/templates/report_taken.html

@@ -23,13 +23,13 @@ <h5>This API is to report vaccine taken</h5>
         <p>[POST] <a href="/report_taken">/report_taken</a> - To report vaccine taken</p>
         <ul>
             <li>All 3 form data parameters are required! [citizen_id, vaccine_name, option]</li>
-            <li>One optional data parameter [option]</li>
             <li>citizen_id: need to be number of 13 digits</li>
             <li>citizen_id: must have been registered</li>
             <li>vaccine_name: need to be one of available vaccine [Pfizer, Astra, Sinofarm, or Sinovac]</li>
             <li>vaccine_name: [for citizen with reservation] need to match the reservation</li>
             <li>vaccine_name: [for walk-in citizen] need to follow <a href="/">vaccination orders</a></li>
-            <li>option: option = "walk-in" for citizen with no reservation</li>
+            <li>option: option = "reserve" for citizen with reservation</li>
+            <li>option: option = "walk-in" for citizen without reservation</li>
         </ul>
     </div>