Sync devel with main

.gitignore

@@ -3,10 +3,15 @@ letsencrypt
 
 # log files
 output.txt
+dump
+err
+logs
+out.logs
 
 # secrets
 secrets
 config.monitoring
+bot_creds.py
 
 # dependencies
 /node_modules

backend/Authentication/AuthenticationAPI.py

@@ -19,7 +19,7 @@
 
 
 def load_mail():
-    current_app.config['MAIL_SERVER'] = 'smtp.office365.com'
+    current_app.config['MAIL_SERVER'] = 'smtp.gmail.com'
     current_app.config['MAIL_PORT'] = 587
     # to test input your own NUS acc email
     current_app.config['MAIL_USERNAME'] = os.environ['EMAIL_USER']
@@ -128,7 +128,7 @@ def register():
         if telegramHandle.startswith('@'):
             telegramHandle = telegramHandle[1:]
 
-        if db.User.find({'userID': userID}).count():  # entry exists
+        if db.User.count_documents({'userID': userID}):  # entry exists
             return jsonify({'message': 'User already exists'}), 401
         # add to User table
         # note: if the user data does not adhere to defined validation standards, an error will be thrown here
@@ -140,7 +140,7 @@ def register():
                             "bio": bio,
                             "block": block,
                             "telegramHandle": telegramHandle,
-                            "profilePictureURI": "https://www.gravatar.com/avatar/00000000000000000000000000000000?d=identicon"
+                            "imageKey": "default/profile_pic.png"
                             })
     except Exception as e:
         print(e)

backend/FacilityBooking/FacilitiesAPI.py

@@ -12,9 +12,9 @@
 
 facilities_api = Blueprint("facilities", __name__)
 
-# Used to convert CCA ID into CCA Name
 
 
+# Used to convert CCA ID into CCA Name
 def conversion(ccaID):
     return str(db.CCA.find_one({"ccaID": ccaID})["ccaName"])
 
@@ -38,6 +38,58 @@ def all_facilities():
     return make_response(response)
 
 
+@ facilities_api.route('/available', methods=["GET"])
+@ cross_origin(supports_credentials=True)
+def available_facilities_within_time():
+    try:
+        all_facilities = list(db.Facilities.find({}, {"_id": 0}).sort("facilityID", 1))
+        startTime = int(request.args.get('startTime')) if request.args.get('startTime') else 0
+        endTime = int(request.args.get('endTime')) if request.args.get('endTime') else -1
+        if endTime <= startTime:
+            return {"err": "Invalid start and end time", "status": "failed"}, 400
+
+        condition = {
+            "$and": [
+            {
+                "startTime": {
+                    "$lt": endTime
+                }
+            },
+            {
+                "endTime": {
+                    "$gt": startTime
+                }
+            }
+            ]
+        }
+
+        pipeline = [
+            {'$match':
+                condition
+             },
+            {'$lookup': {
+                'from': 'Facilities',
+                        'localField': 'facilityID',
+                        'foreignField': 'facilityID',
+                        'as': 'facility'
+            }},
+            {'$unwind': {'path': '$facility', 'preserveNullAndEmptyArrays': True}},
+            {'$addFields': {
+                'facilityName': '$facility.facilityName',
+                'facilityLocation': '$facility.facilityLocation'
+            }},
+            {'$project': {'facilityID': 1, 'facilityName': 1, 'facilityLocation': 1, '_id': 0}}, 
+        ]
+
+        occupied_facilities = list(db.Bookings.aggregate(pipeline))
+        available_facilities = list(filter(lambda fac: fac not in occupied_facilities, all_facilities))
+        response = {"available_facilities": available_facilities, "status": "success"}, 200
+    except Exception as e:
+        print(e)
+        return {"err": "An error has occurred", "status": "failed"}, 500
+    return make_response(response)
+
+
 @ facilities_api.route('/facilities/<facilityID>', methods=["GET"])
 @ cross_origin(supports_credentials=True)
 def get_facility_name(facilityID):
@@ -248,6 +300,76 @@ def check_bookings(facilityID):
     return make_response(response)
 
 
+@ facilities_api.route('/bookings', methods=["GET"])
+@ cross_origin(supports_credentials=True)
+def check_bookings_within_time():
+    try:
+        startTime = int(request.args.get('startTime')) if request.args.get('startTime') else 0
+        endTime = int(request.args.get('endTime')) if request.args.get('endTime') else -1
+        if endTime <= startTime:
+            return {"err": "Invalid start and end time", "status": "failed"}, 400
+
+        condition = {
+            "$and": [
+            {
+                "startTime": {
+                    "$lt": endTime
+                }
+            },
+            {
+                "endTime": {
+                    "$gt": startTime
+                }
+            }
+            ]
+        }
+
+        pipeline = [
+            {'$match':
+                condition
+             },
+            {'$lookup': {
+                'from': 'User',
+                        'localField': 'userID',
+                        'foreignField': 'userID',
+                        'as': 'profile'
+            }},
+            {'$unwind': {'path': '$profile', 'preserveNullAndEmptyArrays': True}},
+            {'$addFields': {
+                'displayName': '$profile.displayName'
+            }},
+            {'$lookup': {
+                'from': 'CCA',
+                        'localField': 'ccaID',
+                        'foreignField': 'ccaID',
+                        'as': 'cca'
+            }},
+            {'$unwind': {'path': '$cca', 'preserveNullAndEmptyArrays': True}},
+            {'$addFields': {
+                'ccaName': '$cca.ccaName'
+            }},
+            {'$lookup': {
+                'from': 'Facilities',
+                        'localField': 'facilityID',
+                        'foreignField': 'facilityID',
+                        'as': 'facility'
+            }},
+            {'$unwind': {'path': '$facility', 'preserveNullAndEmptyArrays': True}},
+            {'$addFields': {
+                'facilityName': '$facility.facilityName'
+            }},
+            {'$project': {'profile': 0, 'cca': 0, 'facility': 0, '_id': 0}}
+        ]
+
+        data = list(db.Bookings.aggregate(pipeline))
+        data.sort(key=lambda x: x.get('startTime'))
+        response = {"startTime": startTime, "endTime": endTime, "bookings_placed": data, "status": "success"}, 200
+    except Exception as e:
+        print(e)
+        return {"err": "An error has occurred", "status": "failed"}, 500
+    return make_response(response)
+
+
 @ facilities_api.route('/bookings', methods=['POST'])
 @ cross_origin(supports_credentials=True)
 def add_booking():

backend/requirements.txt

@@ -1,6 +1,6 @@
 pymongo >= 3.11.2
 flask >= 1.1.2
-jinja2 == 3.0.3
+jinja2 >= 3.0.3
 werkzeug >= 2.0.3
 dnspython >= 2.0.0
 flask-cors >= 3.0.10

docker-compose.prod.yml

@@ -9,6 +9,8 @@ services:
     expose:
       - 8080
     restart: on-failure
+    env_file:
+      - ./secrets/rhapp_env
     networks:
       - intranet
     labels:

docker-compose.yml

@@ -9,6 +9,8 @@ services:
     expose:
       - 8080
     restart: on-failure
+    env_file:
+      - ./secrets/rhapp_env
     networks:
       - intranet
     labels:

frontend/.eslintrc.js

@@ -22,9 +22,12 @@ module.exports = {
     // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
     // e.g. "@typescript-eslint/explicit-function-return-type": "off",
     '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
 
     'prettier/prettier': [
-      'error',
+      // 'error',
+      'off',
       {
         endOfLine: 'auto',
       },