Merge pull request #342 from map-of-pi/feature/pict-christmas-event

Self approved; Add Seasonal 'Holiday Seller' type.

Author: swoocn

src/config/docs/enum/SellerType.yml

@@ -6,4 +6,5 @@ components:
         - activeSeller
         - inactiveSeller
         - testSeller
+        - holidaySeller
       description: The type of seller.

src/index.ts

@@ -33,6 +33,6 @@ const startServer = async () => {
 
 // Start the server setup process
 startServer();
-scheduleCronJobs();
+// scheduleCronJobs();
 
 export default app;

src/models/UserSettings.ts

@@ -60,6 +60,7 @@ const userSettingsSchema = new Schema<IUserSettings>(
         include_active_sellers: { type: Boolean, default: true },
         include_inactive_sellers: { type: Boolean, default: false },
         include_test_sellers: { type: Boolean, default: false },
+        include_holiday_sellers: { type: Boolean, default: true },
         include_trust_level_100: { type: Boolean, default: true },
         include_trust_level_80: { type: Boolean, default: true },
         include_trust_level_50: { type: Boolean, default: true },

src/models/enums/sellerType.ts

@@ -1,5 +1,6 @@
 export enum SellerType {
   Active = 'activeSeller',
   Inactive = 'inactiveSeller',
-  Test = 'testSeller'
+  Test = 'testSeller',
+  Holiday = 'holidaySeller'
 }

src/services/seller.service.ts

@@ -32,6 +32,7 @@ const buildDefaultSearchFilters = () => {
     include_active_sellers: true,
     include_inactive_sellers: false,
     include_test_sellers: false,
+    include_holiday_sellers: true,
     include_trust_level_100: true,
     include_trust_level_80: true,
     include_trust_level_50: true,
@@ -47,6 +48,7 @@ const buildBaseCriteria = (searchFilters: any): Record<string, any> => {
   if (searchFilters.include_active_sellers) sellerTypeFilters.push(SellerType.Active);
   if (searchFilters.include_inactive_sellers) sellerTypeFilters.push(SellerType.Inactive);
   if (searchFilters.include_test_sellers) sellerTypeFilters.push(SellerType.Test);
+  if (searchFilters.include_holiday_sellers) sellerTypeFilters.push(SellerType.Holiday);
 
   // include filtered seller types
   if (sellerTypeFilters.length > 0) {

test/mockData.json

@@ -53,6 +53,7 @@
         "include_active_sellers": true,
         "include_inactive_sellers": true,
         "include_test_sellers": true,
+        "include_holiday_sellers": false,
         "include_trust_level_100": true,
         "include_trust_level_80": true,
         "include_trust_level_50": true,
@@ -76,6 +77,7 @@
         "include_active_sellers": true,
         "include_inactive_sellers": false,
         "include_test_sellers": true,
+        "include_holiday_sellers": false,
         "include_trust_level_100": true,
         "include_trust_level_80": true,
         "include_trust_level_50": false,
@@ -88,8 +90,24 @@
       "user_name": "Test Three",
       "email": "[email protected]",
       "phone_number": "333-333-3333",
+      "image": "http://example.com/testThree.jpg",
       "findme": "deviceGPS",
-      "trust_meter_rating": 50
+      "trust_meter_rating": 50,
+      "search_map_center": { 
+        "type": "Point",
+        "coordinates": [-88.6298, 42.8781]
+      },
+      "search_filters": {
+        "include_active_sellers": true,
+        "include_inactive_sellers": false,
+        "include_test_sellers": true,
+        "include_holiday_sellers": true,
+        "include_trust_level_100": true,
+        "include_trust_level_80": true,
+        "include_trust_level_50": false,
+        "include_trust_level_0": false
+      },
+      "wallet_address": null
     },
     {
       "user_settings_id": "0d0d0d-0d0d-0d0d",
@@ -385,6 +403,18 @@
           "type": "Point",
           "coordinates": [60.753873, 80.534107]
       }
+    },
+    {
+      "seller_id": "0q0q0q-0q0q-0q0q",
+      "name": "Test Seller Holiday",
+      "description": "Test Seller Holiday Event",
+      "address": "Test Seller Holiday Address",
+      "seller_type": "holidaySeller",
+      "isRestricted": false,
+      "sell_map_center": {
+          "type": "Point",
+          "coordinates": [-88.6298, 42.8781]
+      }
     }
   ],
   "sellerItems": [

test/services/seller.service.spec.ts

@@ -41,7 +41,10 @@ describe('getAllSellers function', () => {
     const userData = await User.findOne({ pi_username: 'TestUser1' }) as IUser;
     const sellersData = await getAllSellers(undefined, undefined, userData.pi_uid);
 
-    const expectedCount = await Seller.countDocuments({ isRestricted: { $ne: true } });
+    const expectedCount = await Seller.countDocuments({ 
+      isRestricted: { $ne: true }, 
+      seller_type: { $ne: 'holidaySeller' }
+    });
     expect(sellersData).toHaveLength(expectedCount);
   });