Skip to content

Commit b905b8e

Browse files
o-seliuchenkoo-seliuchenko
committed
Fix banners
1 parent 4b349bc commit b905b8e

File tree

7 files changed

+39
-46
lines changed

7 files changed

+39
-46
lines changed

‎src/controllers/bannerController.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ export const updateBanner = asyncHandler(async (req: Request, res: Response) =>
199199
// Preserve existing activation date fields and IsActive (not editable in edit form)
200200
finalBannerData.StartDate = banner.StartDate;
201201
finalBannerData.EndDate = banner.EndDate;
202-
finalBannerData.ShowDates = banner.ShowDates;
203202
finalBannerData.IsActive = banner.IsActive;
204203

205204
// Update banner
@@ -289,12 +288,10 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
289288
// Handle date range for scheduled activation
290289
if (StartDate !== undefined && StartDate !== null) {
291290
updateData.StartDate = new Date(StartDate);
292-
updateData.ShowDates = true;
293291
} else if (updateData.IsActive && !StartDate) {
294292
// If activating immediately without dates, set StartDate to now
295293
updateData.StartDate = new Date();
296294
updateData.EndDate = null;
297-
updateData.ShowDates = false;
298295
}
299296

300297
if (EndDate !== undefined && EndDate !== null) {
@@ -303,7 +300,6 @@ export const toggleBannerStatus = asyncHandler(async (req: Request, res: Respons
303300
// If deactivating without explicit date, set EndDate to now
304301
updateData.StartDate = null;
305302
updateData.EndDate = new Date();
306-
updateData.ShowDates = false;
307303
}
308304

309305
// Update banner

‎src/index.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ dotenv.config();
1010
connectDB();
1111

1212
// Start background jobs
13-
startVerificationJob();
13+
// Only run verification job on staging environment
14+
if (process.env.NODE_ENV === 'staging' || process.env.ENVIRONMENT === 'staging') {
15+
startVerificationJob();
16+
}
1417
startDisablingJob();
1518
startSwepActivationJob();
1619
startBannerActivationJob();

‎src/models/bannerModel.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ export const BannerSchema = new Schema({
8080
LayoutStyle: { type: String, enum: Object.values(LayoutStyle), required: true },
8181

8282
// Optional features
83-
ShowDates: { type: Boolean, default: false },
8483
StartDate: { type: Date },
8584
EndDate: { type: Date },
8685
BadgeText: { type: String, maxlength: 50 },

‎src/schemas/bannerSchema.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,12 @@ const BannerApiBaseSchema = BannerSchemaCore.omit({
5555
PartnershipCharter: true,
5656
ResourceProject: true,
5757
// Primitives that need preprocessing
58-
ShowDates: true,
5958
IsActive: true,
6059
Priority: true,
6160
StartDate: true,
6261
EndDate: true
6362
}).extend({
6463
// Add back omitted fields with JSON preprocessing for FormData
65-
ShowDates: z.preprocess(preprocessBoolean, z.boolean()).optional(),
6664
IsActive: z.preprocess(preprocessBoolean, z.boolean()).default(true),
6765
Priority: z.preprocess(preprocessNumber, z.number().min(1).max(10)).default(1),
6866
StartDate: z.preprocess(preprocessDate, z.date()).optional(),
@@ -94,7 +92,6 @@ export const BannerPreUploadApiSchema = z.object({
9492
TemplateType: z.nativeEnum(BannerTemplateType),
9593

9694
// Scheduling
97-
ShowDates: z.preprocess(preprocessBoolean, z.boolean()).optional(),
9895
StartDate: z.preprocess(preprocessDate, z.date()).optional(),
9996
EndDate: z.preprocess(preprocessDate, z.date()).optional(),
10097
BadgeText: z.string().max(25, 'Badge text must be 25 characters or less').optional(),

‎src/schemas/bannerSchemaCore.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export const BannerSchemaCore = z.object({
120120
LayoutStyle: z.nativeEnum(LayoutStyle),
121121

122122
// Scheduling
123-
ShowDates: z.boolean().optional(),
124123
StartDate: z.date().optional(),
125124
EndDate: z.date().optional(),
126125
BadgeText: z.string().max(25, 'Badge text must be 25 characters or less').optional(),

‎src/seed-data/swep-population.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"SwepActiveFrom": null,
1212
"SwepActiveUntil": null,
1313
"IsActive": false,
14-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
14+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
1515
"EmergencyContact": {
1616
"Phone": "0800 000 0000",
1717
"Email": "emergency@brighton-hove.gov.uk",
@@ -30,7 +30,7 @@
3030
"SwepActiveFrom": null,
3131
"SwepActiveUntil": null,
3232
"IsActive": false,
33-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
33+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
3434
"EmergencyContact": {
3535
"Phone": "0800 000 0000",
3636
"Email": "emergency@bolton.gov.uk",
@@ -49,7 +49,7 @@
4949
"SwepActiveFrom": null,
5050
"SwepActiveUntil": null,
5151
"IsActive": false,
52-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
52+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
5353
"EmergencyContact": {
5454
"Phone": "0800 000 0000",
5555
"Email": "emergency@bcpcouncil.gov.uk",
@@ -68,7 +68,7 @@
6868
"SwepActiveFrom": null,
6969
"SwepActiveUntil": null,
7070
"IsActive": false,
71-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
71+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
7272
"EmergencyContact": {
7373
"Phone": "0800 000 0000",
7474
"Email": "emergency@salford.gov.uk",
@@ -87,7 +87,7 @@
8787
"SwepActiveFrom": null,
8888
"SwepActiveUntil": null,
8989
"IsActive": false,
90-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
90+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
9191
"EmergencyContact": {
9292
"Phone": "0800 000 0000",
9393
"Email": "emergency@reading.gov.uk",
@@ -106,7 +106,7 @@
106106
"SwepActiveFrom": null,
107107
"SwepActiveUntil": null,
108108
"IsActive": false,
109-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
109+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
110110
"EmergencyContact": {
111111
"Phone": "0800 000 0000",
112112
"Email": "emergency@islington.gov.uk",
@@ -125,7 +125,7 @@
125125
"SwepActiveFrom": null,
126126
"SwepActiveUntil": null,
127127
"IsActive": false,
128-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
128+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
129129
"EmergencyContact": {
130130
"Phone": "0800 000 0000",
131131
"Email": "emergency@stockport.gov.uk",
@@ -144,7 +144,7 @@
144144
"SwepActiveFrom": null,
145145
"SwepActiveUntil": null,
146146
"IsActive": false,
147-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
147+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
148148
"EmergencyContact": {
149149
"Phone": "0800 000 0000",
150150
"Email": "emergency@blackpool.gov.uk",
@@ -163,7 +163,7 @@
163163
"SwepActiveFrom": null,
164164
"SwepActiveUntil": null,
165165
"IsActive": false,
166-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
166+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
167167
"EmergencyContact": {
168168
"Phone": "0800 000 0000",
169169
"Email": "emergency@westmidlands.gov.uk",
@@ -182,7 +182,7 @@
182182
"SwepActiveFrom": null,
183183
"SwepActiveUntil": null,
184184
"IsActive": false,
185-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
185+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
186186
"EmergencyContact": {
187187
"Phone": "0800 000 0000",
188188
"Email": "emergency@cambridgeshire.gov.uk",
@@ -201,7 +201,7 @@
201201
"SwepActiveFrom": null,
202202
"SwepActiveUntil": null,
203203
"IsActive": false,
204-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
204+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
205205
"EmergencyContact": {
206206
"Phone": "0800 000 0000",
207207
"Email": "emergency@southampton.gov.uk",
@@ -220,7 +220,7 @@
220220
"SwepActiveFrom": null,
221221
"SwepActiveUntil": null,
222222
"IsActive": false,
223-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
223+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
224224
"EmergencyContact": {
225225
"Phone": "0800 000 0000",
226226
"Email": "emergency@leeds.gov.uk",
@@ -239,7 +239,7 @@
239239
"SwepActiveFrom": null,
240240
"SwepActiveUntil": null,
241241
"IsActive": false,
242-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
242+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
243243
"EmergencyContact": {
244244
"Phone": "0800 000 0000",
245245
"Email": "emergency@wakefield.gov.uk",
@@ -258,7 +258,7 @@
258258
"SwepActiveFrom": null,
259259
"SwepActiveUntil": null,
260260
"IsActive": false,
261-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
261+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
262262
"EmergencyContact": {
263263
"Phone": "0800 000 0000",
264264
"Email": "emergency@rochdale.gov.uk",
@@ -277,7 +277,7 @@
277277
"SwepActiveFrom": null,
278278
"SwepActiveUntil": null,
279279
"IsActive": false,
280-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
280+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
281281
"EmergencyContact": {
282282
"Phone": "0800 000 0000",
283283
"Email": "emergency@bradford.gov.uk",
@@ -296,7 +296,7 @@
296296
"SwepActiveFrom": null,
297297
"SwepActiveUntil": null,
298298
"IsActive": false,
299-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
299+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
300300
"EmergencyContact": {
301301
"Phone": "0800 000 0000",
302302
"Email": "emergency@nottingham.gov.uk",
@@ -315,7 +315,7 @@
315315
"SwepActiveFrom": null,
316316
"SwepActiveUntil": null,
317317
"IsActive": false,
318-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
318+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
319319
"EmergencyContact": {
320320
"Phone": "0800 000 0000",
321321
"Email": "emergency@tameside.gov.uk",
@@ -334,7 +334,7 @@
334334
"SwepActiveFrom": null,
335335
"SwepActiveUntil": null,
336336
"IsActive": false,
337-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
337+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
338338
"EmergencyContact": {
339339
"Phone": "0800 000 0000",
340340
"Email": "emergency@luton.gov.uk",
@@ -353,7 +353,7 @@
353353
"SwepActiveFrom": null,
354354
"SwepActiveUntil": null,
355355
"IsActive": false,
356-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
356+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
357357
"EmergencyContact": {
358358
"Phone": "0800 000 0000",
359359
"Email": "emergency@oldham.gov.uk",
@@ -372,7 +372,7 @@
372372
"SwepActiveFrom": null,
373373
"SwepActiveUntil": null,
374374
"IsActive": false,
375-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
375+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
376376
"EmergencyContact": {
377377
"Phone": "0800 000 0000",
378378
"Email": "emergency@portsmouth.gov.uk",
@@ -391,7 +391,7 @@
391391
"SwepActiveFrom": null,
392392
"SwepActiveUntil": null,
393393
"IsActive": false,
394-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
394+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
395395
"EmergencyContact": {
396396
"Phone": "0800 000 0000",
397397
"Email": "emergency@liverpool.gov.uk",
@@ -410,7 +410,7 @@
410410
"SwepActiveFrom": null,
411411
"SwepActiveUntil": null,
412412
"IsActive": false,
413-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
413+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
414414
"EmergencyContact": {
415415
"Phone": "0800 000 0000",
416416
"Email": "emergency@haringey.gov.uk",
@@ -429,7 +429,7 @@
429429
"SwepActiveFrom": null,
430430
"SwepActiveUntil": null,
431431
"IsActive": false,
432-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
432+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
433433
"EmergencyContact": {
434434
"Phone": "0800 000 0000",
435435
"Email": "emergency@exeter.gov.uk",
@@ -448,7 +448,7 @@
448448
"SwepActiveFrom": null,
449449
"SwepActiveUntil": null,
450450
"IsActive": false,
451-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
451+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
452452
"EmergencyContact": {
453453
"Phone": "0800 000 0000",
454454
"Email": "emergency@manchester.gov.uk",
@@ -467,7 +467,7 @@
467467
"SwepActiveFrom": null,
468468
"SwepActiveUntil": null,
469469
"IsActive": false,
470-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
470+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
471471
"EmergencyContact": {
472472
"Phone": "0800 000 0000",
473473
"Email": "emergency@edinburgh.gov.uk",
@@ -486,7 +486,7 @@
486486
"SwepActiveFrom": null,
487487
"SwepActiveUntil": null,
488488
"IsActive": false,
489-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
489+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
490490
"EmergencyContact": {
491491
"Phone": "0800 000 0000",
492492
"Email": "emergency@bury.gov.uk",
@@ -505,7 +505,7 @@
505505
"SwepActiveFrom": null,
506506
"SwepActiveUntil": null,
507507
"IsActive": false,
508-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
508+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
509509
"EmergencyContact": {
510510
"Phone": "0800 000 0000",
511511
"Email": "emergency@wigan.gov.uk",
@@ -524,7 +524,7 @@
524524
"SwepActiveFrom": null,
525525
"SwepActiveUntil": null,
526526
"IsActive": false,
527-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
527+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
528528
"EmergencyContact": {
529529
"Phone": "0800 000 0000",
530530
"Email": "emergency@trafford.gov.uk",
@@ -543,7 +543,7 @@
543543
"SwepActiveFrom": null,
544544
"SwepActiveUntil": null,
545545
"IsActive": false,
546-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
546+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
547547
"EmergencyContact": {
548548
"Phone": "0800 000 0000",
549549
"Email": "emergency@coventry.gov.uk",
@@ -562,7 +562,7 @@
562562
"SwepActiveFrom": null,
563563
"SwepActiveUntil": null,
564564
"IsActive": false,
565-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
565+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
566566
"EmergencyContact": {
567567
"Phone": "0800 000 0000",
568568
"Email": "emergency@wolverhampton.gov.uk",
@@ -581,7 +581,7 @@
581581
"SwepActiveFrom": null,
582582
"SwepActiveUntil": null,
583583
"IsActive": false,
584-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
584+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
585585
"EmergencyContact": {
586586
"Phone": "0800 000 0000",
587587
"Email": "emergency@glasgow.gov.uk",
@@ -600,7 +600,7 @@
600600
"SwepActiveFrom": null,
601601
"SwepActiveUntil": null,
602602
"IsActive": false,
603-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
603+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
604604
"EmergencyContact": {
605605
"Phone": "0800 000 0000",
606606
"Email": "emergency@birmingham.gov.uk",
@@ -619,7 +619,7 @@
619619
"SwepActiveFrom": null,
620620
"SwepActiveUntil": null,
621621
"IsActive": false,
622-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
622+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
623623
"EmergencyContact": {
624624
"Phone": "0800 000 0000",
625625
"Email": "emergency@dudley.gov.uk",
@@ -638,7 +638,7 @@
638638
"SwepActiveFrom": null,
639639
"SwepActiveUntil": null,
640640
"IsActive": false,
641-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
641+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
642642
"EmergencyContact": {
643643
"Phone": "0800 000 0000",
644644
"Email": "emergency@chelmsford.gov.uk",
@@ -657,7 +657,7 @@
657657
"SwepActiveFrom": null,
658658
"SwepActiveUntil": null,
659659
"IsActive": false,
660-
"Image": "https://streetsupportstoragestag.blob.core.windows.net/sweps/SWEP.jpg",
660+
"Image": "https://streetsupportstorageprod.blob.core.windows.net/sweps/swep.jpg",
661661
"EmergencyContact": {
662662
"Phone": "0800 000 0000",
663663
"Email": "emergency@derbyshire.gov.uk",

0 commit comments

Comments
 (0)