Skip to content

Commit fd1a757

Browse files
feat: [AB#17071] validing and fixing zod data
1 parent e049983 commit fd1a757

15 files changed

+2593
-420
lines changed

api/src/db/DynamoDataClient.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { BusinessesDataClient, DatabaseClient, UserDataClient } from "@domain/ty
22
import { LogWriterType } from "@libs/logWriter";
33
import { Business, CURRENT_VERSION, UserData } from "@shared/userData";
44
import { chunk } from "lodash";
5+
import { parseUserData } from "@db/zodSchema/zodSchemas";
56

67
export const DynamoDataClient = (
78
userDataClient: UserDataClient,
@@ -67,6 +68,7 @@ export const DynamoDataClient = (
6768
usersToMigrate.map(async (user) => {
6869
await updateUserAndBusinesses(user);
6970
logger.LogInfo(`Migrated user ${user.user.id} to version ${CURRENT_VERSION}`);
71+
parseUserData(logger, user);
7072
}),
7173
);
7274

api/src/db/DynamoUserDataClient.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Migrations } from "@db/migrations/migrations";
77
import { type CryptoClient, UserDataClient } from "@domain/types";
88
import { LogWriterType } from "@libs/logWriter";
99
import { CURRENT_VERSION, UserData } from "@shared/userData";
10-
import { parseUserData } from "@db/zodSchema/zodSchemas";
1110

1211
const marshallOptions = {
1312
// Whether to automatically convert empty strings, blobs, and sets to `null`.
@@ -56,7 +55,6 @@ export const DynamoUserDataClient = (
5655

5756
const doMigration = async (data: UserData): Promise<UserData> => {
5857
const migratedData = await migrateData(data, logger);
59-
parseUserData(logger, data);
6058
await put(migratedData);
6159
return migratedData;
6260
};

api/src/db/migrations/migrations.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ import { migrate_v179_to_v180 } from "@db/migrations/v180_add_email_sent_environ
184184
import { migrate_v180_to_v181 } from "@db/migrations/v181_add_updates_reminders_and_phone_number";
185185
import { migrate_v181_to_v182 } from "@db/migrations/v182_move_profile_non_essential_questions_to_non_essential_questions_section";
186186
import { migrate_v182_to_v183 } from "@db/migrations/v183_zod_changes";
187+
import { migrate_v183_to_v184 } from "@db/migrations/v184_change_addresscountry_interstatetransport";
187188

188189
// Effectively (data: v_UserData, clients: MigrationClients) => v_UserData | Promise<v_UserData>
189190
export type MigrationFunction = (data: any, clients: MigrationClients) => any;
@@ -372,6 +373,7 @@ export const Migrations: MigrationFunction[] = [
372373
migrate_v180_to_v181,
373374
migrate_v181_to_v182,
374375
migrate_v182_to_v183,
376+
migrate_v183_to_v184,
375377
];
376378

377-
export { generatev183UserData as CURRENT_GENERATOR } from "@db/migrations/v183_zod_changes";
379+
export { generatev184UserData as CURRENT_GENERATOR } from "@db/migrations/v184_change_addresscountry_interstatetransport";

0 commit comments

Comments
 (0)