Merge pull request #67 from StreetSupport/staging

Merge staging into main

Author: o-seliuchenko

src/controllers/bannerController.ts

@@ -199,7 +199,6 @@ export const updateBanner = asyncHandler(async (req: Request, res: Response) =>
   // Preserve existing activation date fields and IsActive (not editable in edit form)
   finalBannerData.StartDate = banner.StartDate;
   finalBannerData.EndDate = banner.EndDate;
-  finalBannerData.ShowDates = banner.ShowDates;
   finalBannerData.IsActive = banner.IsActive;
 
   // Update banner
@@ -289,12 +288,10 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
   // Handle date range for scheduled activation
   if (StartDate !== undefined && StartDate !== null) {
     updateData.StartDate = new Date(StartDate);
-    updateData.ShowDates = true;
   } else if (updateData.IsActive && !StartDate) {
     // If activating immediately without dates, set StartDate to now
     updateData.StartDate = new Date();
     updateData.EndDate = null;
-    updateData.ShowDates = false;
   }
 
   if (EndDate !== undefined && EndDate !== null) {
@@ -303,7 +300,6 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
     // If deactivating without explicit date, set EndDate to now
     updateData.StartDate = null;
     updateData.EndDate = new Date();
-    updateData.ShowDates = false;
   }
 
   // Update banner

src/index.ts

@@ -10,7 +10,10 @@ dotenv.config();
 connectDB();
 
 // Start background jobs
-startVerificationJob();
+// Only run verification job on staging environment
+if (process.env.NODE_ENV === 'staging' || process.env.ENVIRONMENT === 'staging') {
+  startVerificationJob();
+}
 startDisablingJob();
 startSwepActivationJob();
 startBannerActivationJob();

src/models/bannerModel.ts

@@ -80,7 +80,6 @@ export const BannerSchema = new Schema({
   LayoutStyle: { type: String, enum: Object.values(LayoutStyle), required: true },
 
   // Optional features
-  ShowDates: { type: Boolean, default: false },
   StartDate: { type: Date },
   EndDate: { type: Date },
   BadgeText: { type: String, maxlength: 50 },

src/schemas/bannerSchema.ts

@@ -55,14 +55,12 @@ const BannerApiBaseSchema = BannerSchemaCore.omit({
   PartnershipCharter: true,
   ResourceProject: true,
   // Primitives that need preprocessing
-  ShowDates: true,
   IsActive: true,
   Priority: true,
   StartDate: true,
   EndDate: true
 }).extend({
   // Add back omitted fields with JSON preprocessing for FormData
-  ShowDates: z.preprocess(preprocessBoolean, z.boolean()).optional(),
   IsActive: z.preprocess(preprocessBoolean, z.boolean()).default(true),
   Priority: z.preprocess(preprocessNumber, z.number().min(1).max(10)).default(1),
   StartDate: z.preprocess(preprocessDate, z.date()).optional(),
@@ -94,7 +92,6 @@ export const BannerPreUploadApiSchema = z.object({
   TemplateType: z.nativeEnum(BannerTemplateType),
 
   // Scheduling
-  ShowDates: z.preprocess(preprocessBoolean, z.boolean()).optional(),
   StartDate: z.preprocess(preprocessDate, z.date()).optional(),
   EndDate: z.preprocess(preprocessDate, z.date()).optional(),
   BadgeText: z.string().max(25, 'Badge text must be 25 characters or less').optional(),

src/schemas/bannerSchemaCore.ts

@@ -120,7 +120,6 @@ export const BannerSchemaCore = z.object({
   LayoutStyle: z.nativeEnum(LayoutStyle),
 
   // Scheduling
-  ShowDates: z.boolean().optional(),
   StartDate: z.date().optional(),
   EndDate: z.date().optional(),
   BadgeText: z.string().max(25, 'Badge text must be 25 characters or less').optional(),