Merge pull request #65 from StreetSupport/staging

Merge staging to main

Author: o-seliuchenko

src/app.ts

@@ -23,12 +23,6 @@ app.use(express.json());
 
 app.use(checkJwt);
 
-// TODO: We will remove this route after testing
-app.get("/debug-sentry", function mainHandler(req) {
-  const { message = 'Test error message' } = req.query;
-  throw new Error(`Sentry Test Error: ${message}`);
-});
-
 app.use('/api/cities', cityRoutes);
 app.use('/api/faqs', faqRoutes);
 app.use('/api/services', serviceRoutes);

src/controllers/bannerController.ts

@@ -290,19 +290,20 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
   if (StartDate !== undefined && StartDate !== null) {
     updateData.StartDate = new Date(StartDate);
     updateData.ShowDates = true;
-  } else if (updateData.IsActive && !existingBanner.StartDate) {
+  } else if (updateData.IsActive && !StartDate) {
     // If activating immediately without dates, set StartDate to now
     updateData.StartDate = new Date();
-    updateData.ShowDates = true;
+    updateData.EndDate = null;
+    updateData.ShowDates = false;
   }
 
   if (EndDate !== undefined && EndDate !== null) {
     updateData.EndDate = new Date(EndDate);
-    updateData.ShowDates = true;
   } else if (!updateData.IsActive && !EndDate) {
     // If deactivating without explicit date, set EndDate to now
+    updateData.StartDate = null;
     updateData.EndDate = new Date();
-    updateData.ShowDates = true;
+    updateData.ShowDates = false;
   }
 
   // Update banner
@@ -315,6 +316,7 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
   return sendSuccess(res, updatedBanner, `Banner ${updatedBanner?.IsActive ? 'activated' : 'deactivated'} successfully`);
 });
 
+// TODO: Remove it if we are going to get "Downloads" from GA4
 // Increment download count for resource banners
 export const incrementDownloadCount = asyncHandler(async (req: Request, res: Response) => {
   const { id } = req.params;

src/controllers/swepBannerController.ts

@@ -185,15 +185,17 @@ export const toggleSwepBannerActive = asyncHandler(async (req: Request, res: Res
   // Handle date range for scheduled activation
   if (SwepActiveFrom !== undefined && SwepActiveFrom !== null) {
     updateData.SwepActiveFrom = new Date(SwepActiveFrom);
-  } else if (updateData.IsActive && !existingSwep.SwepActiveFrom) {
+  } else if (updateData.IsActive && !SwepActiveFrom) {
     // If activating immediately without dates, set SwepActiveFrom to now
     updateData.SwepActiveFrom = new Date();
+    updateData.SwepActiveUntil = null;
   }
 
   if (SwepActiveUntil !== undefined && SwepActiveUntil !== null) {
     updateData.SwepActiveUntil = new Date(SwepActiveUntil);
   } else if (!updateData.IsActive && !SwepActiveUntil) {
     // If deactivating without explicit date, set SwepActiveUntil to now
+    updateData.SwepActiveFrom = null;
     updateData.SwepActiveUntil = new Date();
   }
 

src/models/swepModel.ts

@@ -77,6 +77,6 @@ SwepBannerSchema.index({ IsActive: 1 });
 SwepBannerSchema.index({ SwepActiveFrom: 1, SwepActiveUntil: 1 });
 
 // Create and export the model
-export const SwepBanner = model<ISwepBanner>('SwepBanner', SwepBannerSchema);
+export const SwepBanner = model<ISwepBanner>('SwepBanners', SwepBannerSchema);
 
 export default SwepBanner;