Fix PiCT reported bugs. (#14)

* Allow map vs button interactions in the homescreen and map center screen.

* Added Findme feature and updated map_center settings (Backend).

* Added Findme feature and updated map_center settings (Frontend).

* Adjustments to search click behavior and zoom level for results.

Author: swoocn

backend/src/config/docs/MapCenterSchema.yml

@@ -39,6 +39,9 @@ components:
           example: 40.7128
         type:
           type: string
+          enum:
+            - search
+            - sell
           example: search
 
     SaveMapCenterRs:

backend/src/config/docs/UserPreferencesSchema.yml

@@ -131,52 +131,73 @@ components:
         - user_settings_id
 
     DeleteUserPreferencesRs:
-        type: object
-        properties:
-          message:
-            type: string
-            example: User Preferences deleted successfully.
-          deletedUserPreferences:
-            type: object
-            properties:
-              user_settings_id:
-                type: string
-                example: 0d367ba3-a2e8-4380-86c3-ab7c0b7890c0
-              user_name:
-                type: string
-                example: Test User
-              email:
-                type: string
-                example: example@test.com
-              phone_number:
-                type: string
-                example: +1 123 456 7890
-              image:
-                type: string
-                format: binary
-                example: http://example.com/image.jpg
-              findme:
-                $ref: '/api/docs/enum/DeviceLocationType.yml#/components/schemas/DeviceLocationType'
-              trust_meter_rating:
-                $ref: '/api/docs/enum/TrustMeterScale.yml#/components/schemas/TrustMeterScale'
-              search_map_center:
-                type: object
-                properties:
-                  type:
-                    type: string
-                    example: Point
-                  coordinates:
-                    type: array
-                    items:
-                      type: number
-                    example: [-73.856077, 40.848447]
-                required:
-                  - type
-                  - coordinates
-              _id:
-                type: string
-                example: 666c84b9d77068c6efeeaa1a
-              __v:
-                type: number
-                example: 0
-  
+      type: object
+      properties:
+        message:
+          type: string
+          example: User Preferences deleted successfully.
+        deletedUserPreferences:
+          type: object
+          properties:
+            user_settings_id:
+              type: string
+              example: 0d367ba3-a2e8-4380-86c3-ab7c0b7890c0
+            user_name:
+              type: string
+              example: Test User
+            email:
+              type: string
+              example: example@test.com
+            phone_number:
+              type: string
+              example: +1 123 456 7890
+            image:
+              type: string
+              format: binary
+              example: http://example.com/image.jpg
+            findme:
+              $ref: '/api/docs/enum/DeviceLocationType.yml#/components/schemas/DeviceLocationType'
+            trust_meter_rating:
+              $ref: '/api/docs/enum/TrustMeterScale.yml#/components/schemas/TrustMeterScale'
+            search_map_center:
+              type: object
+              properties:
+                type:
+                  type: string
+                  example: Point
+                coordinates:
+                  type: array
+                  items:
+                    type: number
+                  example: [-73.856077, 40.848447]
+              required:
+                - type
+                - coordinates
+            _id:
+              type: string
+              example: 666c84b9d77068c6efeeaa1a
+            __v:
+              type: number
+              example: 0
+
+    GetUserLocationRs:
+      type: object
+      properties:
+        origin: 
+          type: object
+          properties:
+            lat:
+              type: number
+              example: -73.856077
+            lng:
+              type: number
+              example: 40.848447
+          required:
+            - lat
+            - lng
+        radius:
+          type: number
+          example: 10
+      required:
+        - origin
+        - radius

backend/src/config/docs/enum/DeviceLocationType.yml

@@ -3,6 +3,7 @@ components:
     DeviceLocationType:
       type: string
       enum:
+        - auto
         - deviceGPS
         - searchCenter
       description: The type of FindMe device location.

backend/src/controllers/mapCenterController.ts

@@ -20,28 +20,7 @@ export const saveMapCenter = async (req: Request, res: Response) => {
     const mapCenter = await mapCenterService.createOrUpdateMapCenter(map_center_id, longitude, latitude, type);
     logger.info(`${type === 'search' ? 'Search' : 'Sell'} Center saved successfully for user ${map_center_id} with Longitude: ${longitude}, Latitude: ${latitude} `);
 
-    if (type === 'sell') {
-      const sellMapCenter = {
-        type: 'Point',
-        coordinates: [longitude, latitude],
-      };
-
-      // Update the seller's sell_map_center
-      const updatedSeller = await Seller.findOneAndUpdate(
-        { seller_id: map_center_id },
-        { $set: { sell_map_center: sellMapCenter } },
-        { new: true }
-      ).exec();
-
-      if (updatedSeller) {
-        logger.info(`Seller's sell_map_center updated for seller_id: ${map_center_id}`, { updatedSeller });
-      } else {
-        logger.warn(`Seller not found for seller_id: ${map_center_id}. sell_map_center not updated.`);
-        return res.status(404).json({ message: 'Seller not found: Map Center failed to save' });
-      }
-    }
-    return res.status(200).json(mapCenter);
-
+    return res.status(200).json({uid: map_center_id, map_center: mapCenter});
   } catch (error: any) {
     logger.error('Failed to save Map Center:', { 
       message: error.message,
@@ -55,8 +34,9 @@ export const saveMapCenter = async (req: Request, res: Response) => {
 export const getMapCenter = async (req: Request, res: Response) => {
   try {
     const map_center_id = req.currentUser?.pi_uid;
+    const {type} = req.params;
     if (map_center_id) {
-      const mapCenter: IMapCenter | null = await mapCenterService.getMapCenterById(map_center_id);
+      const mapCenter: IMapCenter | null = await mapCenterService.getMapCenterById(map_center_id, type);
       if (!mapCenter) {
         logger.warn(`Map Center not found for user ${map_center_id}`);
         return res.status(404).json({ message: "Map Center not found" });

backend/src/controllers/sellerController.ts

@@ -9,7 +9,7 @@ export const fetchSellersByCriteria = async (req: Request, res: Response) => {
   try {
     const { origin, radius, search_query } = req.body;
     const sellers = await sellerService.getAllSellers(origin, radius, search_query);
-    const originString = origin ? `(${origin.lng}, ${origin.lat})` : 'undefined';
+    const originString = origin ? `(${origin.lat}, ${origin.lng})` : 'undefined';
 
     if (!sellers || sellers.length === 0) {
       logger.warn(`No sellers found within ${radius ?? 'undefined'} km of ${originString} with "${search_query ?? 'undefined'}"`);

backend/src/controllers/userPreferencesController.ts

@@ -88,3 +88,29 @@ export const deleteUserPreferences = async (req: Request, res: Response) => {
     return res.status(500).json({ message: 'An error occurred while deleting user preferences; please try again later' });
   }
 };
+
+export const getUserLocation = async (req: Request, res: Response) => {
+  let origin: { lat: number; lng: number };
+
+  // Default map center (example: New York City)
+  const defaultMapCenter: { lat: number; lng: number } = { lat: 20, lng: -74.006 };
+  try {
+    const authUser = req.currentUser;
+    const radius = 15;
+    if (authUser) {
+      let location = await userSettingsService.userLocation(authUser?.pi_uid); 
+      origin = location? location: defaultMapCenter;
+      logger.info('origin from backend:', origin)
+    } else {
+      origin = defaultMapCenter;
+    }
+    return res.status(200).json({ origin: origin, radius: radius });
+  } catch (error: any) {
+    logger.error(`Failed to get user location for piUID ${ req.currentUser?.pi_uid }:`, {
+      message: error.message,
+      config: error.config,
+      stack: error.stack
+    });
+    return res.status(500).json({ message: 'An error occurred while getting user location; please try again later' });
+  }
+};

backend/src/models/MapCenter.ts

@@ -16,7 +16,7 @@
       },
       seller_type: {
         type: String,
-        enum: Object.values(SellerType),
+        enum: Object.values(SellerType).filter(value => typeof value === 'string'),
         required: true,
         default: SellerType.Test,
       },

backend/src/models/Seller.ts

@@ -1,6 +1,7 @@
 import mongoose, { Schema } from "mongoose";
 
 import { IUserSettings } from "../types";
+import { DeviceLocationType } from "./enums/deviceLocationType";
 import { TrustMeterScale } from "./enums/trustMeterScale";
 
 const userSettingsSchema = new Schema<IUserSettings>(
@@ -25,11 +26,13 @@ const userSettingsSchema = new Schema<IUserSettings>(
     image: {
       type: String,
       required: false,
+      default: ''
     },
     findme: {
       type: String,
+      enum: Object.values(DeviceLocationType).filter(value => typeof value === 'string'),
       required: true,
-      default: 'deviceGPS'
+      default: DeviceLocationType.Automatic
     },
     trust_meter_rating: {
       type: Number,

backend/src/models/UserSettings.ts

@@ -0,0 +1,6 @@
+export enum DeviceLocationType {
+  Automatic = 'auto',
+  GPS = 'deviceGPS',
+  SearchCenter = 'searchCenter'
+}
+  

backend/src/models/enums/deviceLocationType.ts

@@ -23,11 +23,18 @@ const mapCenterRoutes = Router();
 
 /**
  * @swagger
- * /api/v1/map-center:
+ * /api/v1/map-center/{type}:
  *   get:
  *     tags:
  *       - Map Center
- *     summary: Get the user's map center *
+ *     summary: Get the user's map center by type *
+ *     parameters:
+ *       - name: type
+ *         in: path
+ *         required: true
+ *         schema:
+ *           type: string
+ *         description: The type of the map center to retrieve
  *     responses:
  *       200:
  *         description: Successful response
@@ -45,7 +52,7 @@ const mapCenterRoutes = Router();
  *         description: Internal server error
  */
 mapCenterRoutes.get(
-  '/', 
+  '/:type', 
   verifyToken, 
   mapCenterController.getMapCenter
 );

backend/src/routes/mapCenter.routes.ts

@@ -107,7 +107,7 @@ userPreferencesRoutes.post(
   isUserSettingsFound,
   userPreferencesController.fetchUserPreferences);
 
-  /**
+/**
  * @swagger
  * /api/v1/user-preferences/add:
  *   put:
@@ -178,4 +178,31 @@ userPreferencesRoutes.delete(
   userPreferencesController.deleteUserPreferences
 );
 
-export default userPreferencesRoutes;
+/**
+ * @swagger
+ * /api/v1/user-preferences/location/me:
+ *   get:
+ *     tags:
+ *       - User Preferences
+ *     summary: Fetch the user's current location using Bearer Auth token *
+ *     responses:
+ *       200:
+ *         description: Successful response
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '/api/docs/UserPreferencesSchema.yml#/components/schemas/GetUserLocationRs'
+ *       401:
+ *         description: Unauthorized | Authentication token is required | Authentication token is invalid or expired
+ *       400:
+ *         description: Bad request
+ *       500:
+ *         description: Internal server error
+ */
+userPreferencesRoutes.get(
+  '/location/me',
+  verifyToken,
+  userPreferencesController.getUserLocation
+)
+
+export default userPreferencesRoutes;