Skip to content

Commit a369732

Browse files
Merge pull request #40 from StreetSupport/feature/3017-create-location-specific-content-management-system
3017 - Fix swep activation job
2 parents abbb023 + 4a06c0e commit a369732

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/jobs/swepActivationJob.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export function startSwepActivationJob() {
2323
// Find all SWEP banners that have activation dates
2424
const swepBanners = await SwepBanner.find({
2525
$or: [
26-
{ swepActiveFrom: { $exists: true, $ne: null } },
27-
{ swepActiveUntil: { $exists: true, $ne: null } }
26+
{ SwepActiveFrom: { $exists: true, $ne: null } },
27+
{ SwepActiveUntil: { $exists: true, $ne: null } }
2828
]
2929
});
3030

src/schemas/resourceSchema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { preprocessJSON, preprocessNumber } from './validationHelpers.js';
55
// Link Schema for link list items
66
export const LinkSchema = z.object({
77
Title: z.string().min(1, 'Link name is required'),
8-
Link: z.string().min(1, 'Link URL is required').url('Please enter a valid URL'),
9-
Description: z.string().optional(), // For pdf-link type
10-
Header: z.string().optional() // For pdf-link type
8+
Link: z.string(),
9+
Description: z.string().optional(), // For file-link type
10+
Header: z.string().optional() // For file-link type
1111
});
1212

1313
// LinkList Schema
1414
export const LinkListSchema = z.object({
15-
Name: z.string().min(1, 'Link list name is required').optional(),
15+
Name: z.string().optional(),
1616
Type: z.nativeEnum(LinkListType, {
1717
message: 'Invalid link list type'
1818
}),

src/seed-data/resources-seed.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
"LinkList": [
376376
{
377377
"Name": "",
378-
"Type": "pdf-link",
378+
"Type": "file-link",
379379
"Priority": 1,
380380
"Links": [
381381
{

src/types/resources/ILinkList.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import mongoose from "mongoose";
22
import { ILink, LinkSchema } from "./ILink.js";
33

4-
// Accommodation Type Enum
4+
// Link List Type Enum
55
export enum LinkListType {
66
LINK = 'link',
77
CARD_LINK = 'card-link',
8-
PDF_LINK = 'pdf-link'
8+
FILE_LINK = 'file-link'
99
}
1010

1111
export interface ILinkList {

0 commit comments

Comments
 (0)