Skip to content

Commit b2fc902

Browse files
authored
Rename campaigns date fields (safe-global#1552)
Renames periodStart as startDate. Renames periodEnd as endDate. Renames activities as activitiesMetadata.
1 parent e90c46f commit b2fc902

File tree

6 files changed

+30
-31
lines changed

6 files changed

+30
-31
lines changed

src/domain/locking/entities/__tests__/campaign.builder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ export function campaignBuilder(): IBuilder<Campaign> {
88
.with('campaignId', faker.string.uuid())
99
.with('name', faker.word.words())
1010
.with('description', faker.lorem.sentence())
11-
.with('periodStart', faker.date.recent())
12-
.with('periodEnd', faker.date.future())
11+
.with('startDate', faker.date.recent())
12+
.with('endDate', faker.date.future())
1313
.with('lastUpdated', faker.date.recent())
1414
.with(
15-
'activities',
15+
'activitiesMetadata',
1616
Array.from({ length: faker.number.int({ min: 0, max: 5 }) }, () =>
1717
activityMetadataBuilder().build(),
1818
),

src/domain/locking/entities/campaign.entity.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ export const CampaignSchema = z.object({
88
campaignId: z.string(),
99
name: z.string(),
1010
description: z.string(),
11-
periodStart: z.coerce.date(),
12-
periodEnd: z.coerce.date(),
11+
startDate: z.coerce.date(),
12+
endDate: z.coerce.date(),
1313
lastUpdated: z.coerce.date(),
14-
activities: z.array(ActivityMetadataSchema).nullish().default(null),
14+
activitiesMetadata: z.array(ActivityMetadataSchema).nullish().default(null),
1515
});
1616

1717
export const CampaignPageSchema = buildPageSchema(CampaignSchema);

src/domain/locking/entities/schemas/__tests__/campaign.schema.spec.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@ describe('CampaignSchema', () => {
1111
expect(result.success).toBe(true);
1212
});
1313

14-
it.each([
15-
'periodStart' as const,
16-
'periodEnd' as const,
17-
'lastUpdated' as const,
18-
])(`should coerce %s to a date`, (field) => {
19-
const campaign = campaignBuilder().build();
14+
it.each(['startDate' as const, 'endDate' as const, 'lastUpdated' as const])(
15+
`should coerce %s to a date`,
16+
(field) => {
17+
const campaign = campaignBuilder().build();
2018

21-
const result = CampaignSchema.safeParse(campaign);
19+
const result = CampaignSchema.safeParse(campaign);
2220

23-
expect(result.success && result.data[field]).toStrictEqual(
24-
new Date(campaign[field]),
25-
);
26-
});
21+
expect(result.success && result.data[field]).toStrictEqual(
22+
new Date(campaign[field]),
23+
);
24+
},
25+
);
2726

2827
it('should not validate an invalid campaign', () => {
2928
const campaign = { invalid: 'campaign' };
@@ -55,12 +54,12 @@ describe('CampaignSchema', () => {
5554
},
5655
{
5756
code: 'invalid_date',
58-
path: ['periodStart'],
57+
path: ['startDate'],
5958
message: 'Invalid date',
6059
},
6160
{
6261
code: 'invalid_date',
63-
path: ['periodEnd'],
62+
path: ['endDate'],
6463
message: 'Invalid date',
6564
},
6665
{

src/domain/locking/entities/schemas/campaign.schema.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export const CampaignSchema = z.object({
55
campaignId: z.string(),
66
name: z.string(),
77
description: z.string(),
8-
periodStart: z.coerce.date(),
9-
periodEnd: z.coerce.date(),
8+
startDate: z.coerce.date(),
9+
endDate: z.coerce.date(),
1010
lastUpdated: z.coerce.date(),
11-
activities: z.array(ActivityMetadataSchema).nullish().default(null),
11+
activitiesMetadata: z.array(ActivityMetadataSchema).nullish().default(null),
1212
});

src/routes/locking/entities/campaign.entity.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ export class Campaign implements DomainCampaign {
1010
@ApiProperty()
1111
description!: string;
1212
@ApiProperty({ type: String })
13-
periodStart!: Date;
13+
startDate!: Date;
1414
@ApiProperty({ type: String })
15-
periodEnd!: Date;
15+
endDate!: Date;
1616
@ApiProperty({ type: String })
1717
lastUpdated!: Date;
1818
@ApiProperty({ type: [ActivityMetadata] })
19-
activities!: ActivityMetadata[] | null;
19+
activitiesMetadata!: ActivityMetadata[] | null;
2020
}

src/routes/locking/locking.controller.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ describe('Locking (Unit)', () => {
8686
.expect(200)
8787
.expect({
8888
...campaign,
89-
periodStart: campaign.periodStart.toISOString(),
90-
periodEnd: campaign.periodEnd.toISOString(),
89+
startDate: campaign.startDate.toISOString(),
90+
endDate: campaign.endDate.toISOString(),
9191
lastUpdated: campaign.lastUpdated.toISOString(),
9292
});
9393
});
@@ -117,8 +117,8 @@ describe('Locking (Unit)', () => {
117117
previous: null,
118118
results: campaignsPage.results.map((campaign) => ({
119119
...campaign,
120-
periodStart: campaign.periodStart.toISOString(),
121-
periodEnd: campaign.periodEnd.toISOString(),
120+
startDate: campaign.startDate.toISOString(),
121+
endDate: campaign.endDate.toISOString(),
122122
lastUpdated: campaign.lastUpdated.toISOString(),
123123
})),
124124
});
@@ -179,8 +179,8 @@ describe('Locking (Unit)', () => {
179179
previous: null,
180180
results: campaignsPage.results.map((campaign) => ({
181181
...campaign,
182-
periodStart: campaign.periodStart.toISOString(),
183-
periodEnd: campaign.periodEnd.toISOString(),
182+
startDate: campaign.startDate.toISOString(),
183+
endDate: campaign.endDate.toISOString(),
184184
lastUpdated: campaign.lastUpdated.toISOString(),
185185
})),
186186
});

0 commit comments

Comments
 (0)