Working demo

.gcloudignore

@@ -0,0 +1,17 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Node.js dependencies:
+node_modules/

.gitignore

@@ -5,3 +5,4 @@
 /.vs/ncr-agile-wombo/v17/.wsuo
 /.vs/slnx.sqlite
 /.vs/VSWorkspaceState.json
+node_modules

api/atmRoutes.js

@@ -27,30 +27,15 @@ router.post("/api/atms/filter", async (req, res) => {
     const atms = await db
       .collection("ATMs")
       .find({
-        Accessibility: {
-          $all: req.body.Accessibility
-            ? req.body.Accessibility
-            : ["AudioCashMachine", "WheelchairAccess"],
+        Accessibility: req.body.Accessibility
+          ? { $all: req.body.Accessibility }
+          : { $exists: true, $ne: null },
+        ATMServices: req.body.ATMServices
+          ? { $all: req.body.ATMServices }
+          : { $exists: true, $ne: null },
+        Access24HoursIndicator: {
+          $in: [req.body.Access24HoursIndicator, true, false],
         },
-        ATMServices: {
-          $all: req.body.ATMServices,
-        },
-        ATMServices: {
-          $all: req.body.ATMServices
-            ? req.body.ATMServices
-            : [
-                "CashWithdrawal",
-                "CashDeposits",
-                "PINChange",
-                "ChequeDeposits",
-                "Balance",
-              ],
-        },
-        Access24HoursIndicator: req.body.Access24HoursIndicator
-          ? req.body.Access24HoursIndicator
-          : {
-              $in: [true, false],
-            },
         $and: [
           {
             $expr: {
@@ -65,12 +50,12 @@ router.post("/api/atms/filter", async (req, res) => {
           },
           {
             $expr: {
-              $lt: [
-                req.body.Latitude - req.body.Radius / 111,
+              $gt: [
                 {
                   $toDouble:
                     "$Location.PostalAddress.GeoLocation.GeographicCoordinates.Latitude",
                 },
+                req.body.Latitude - req.body.Radius / 111,
               ],
             },
           },
@@ -87,12 +72,12 @@ router.post("/api/atms/filter", async (req, res) => {
           },
           {
             $expr: {
-              $lt: [
-                req.body.Longitude - req.body.Radius / 111,
+              $gt: [
                 {
                   $toDouble:
                     "$Location.PostalAddress.GeoLocation.GeographicCoordinates.Longitude",
                 },
+                req.body.Longitude - req.body.Radius / 111,
               ],
             },
           },

api/branchRoutes.js

@@ -24,25 +24,15 @@ router.get("/api/branches", async (req, res) => {
 
 router.post("/api/branches/filter", async (req, res) => {
   try {
-    const atms = await db
+    const branches = await db
       .collection("Branches")
       .find({
-        Accessibility: {
-          $all: req.body.Accessibility
-            ? req.body.Accessibility
-            : [
-                "WheelchairAccess",
-                "LowerLevelCounter",
-                "LevelAccess",
-                "InductionLoop",
-                "AutomaticDoors",
-              ],
-        },
-        ServiceAndFacility: {
-          $all: req.body.ServiceAndFacility
-            ? req.body.ServiceAndFacility
-            : ["WiFi"],
-        },
+        Accessibility: req.body.Accessibility
+          ? { $all: req.body.Accessibility }
+          : { $exists: true, $ne: null },
+        ServiceAndFacility: req.body.ServiceAndFacility
+          ? { $all: req.body.ServiceAndFacility }
+          : { $exists: true, $ne: null },
         $and: [
           {
             $expr: {
@@ -91,7 +81,7 @@ router.post("/api/branches/filter", async (req, res) => {
         ],
       })
       .toArray();
-    res.json(atms);
+    res.json(branches);
   } catch (error) {
     handleError(res, error);
   }

backend.yaml

@@ -0,0 +1,20 @@
+runtime: nodejs20
+
+service: backend
+
+instance_class: F1
+
+automatic_scaling:
+  min_instances: 0
+  max_instances: 1
+  min_idle_instances: 0
+  max_idle_instances: 1
+  min_pending_latency: 30ms
+  max_pending_latency: automatic
+  max_concurrent_requests: 50
+
+handlers:
+  - url: /.*
+    secure: always
+    redirect_http_response_code: 301
+    script: auto

be/server.js

@@ -4,10 +4,12 @@ const express = require("express");
 const cors = require("cors");
 const routes = require("./routes");
 const bodyParser = require("body-parser");
+const path = require("path");
 
 const app = express();
 app.use(cors());
 app.use(bodyParser.json());
+app.use(express.static(path.join(__dirname, "..", "fe")));
 
 // Use the routes defined in routes.js
 app.use("/", routes);