Skip to content

Commit d074ae7

Browse files
committed
Fix: Don't return unions from userdata collection router (issues with validation, and type-guards can just be used in frontend)
1 parent 79e6c29 commit d074ae7

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ PluginController.routers$.subscribe(async routerConfigs => {
119119
if (error.messageValue.errors.length === 1) {
120120
return status(200, error.value);
121121
}
122+
} else {
123+
console.log('We got a validation error', Bun.inspect(error.messageValue, { depth: 2 }));
122124
}
123125
}
124126
})

src/routers/modules/user-management/userdata-collection.router.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,35 +129,31 @@ const configuration = {
129129
},
130130
[Collection.compilation]: {
131131
guard: isCompilation,
132-
schema: t.Union([
133-
ICompilationSchema,
134-
ICompilationResolvedOnlyEntitiesSchema,
135-
ICompilationResolvedSchema,
136-
]),
132+
schema: ICompilationSchema,
137133
},
138134
[Collection.contact]: {
139135
guard: isContact,
140-
schema: t.Union([IContactSchema]),
136+
schema: IContactSchema,
141137
},
142138
[Collection.digitalentity]: {
143139
guard: isDigitalEntity,
144-
schema: t.Union([IDigitalEntitySchema, IDigitalEntityResolvedSchema]),
140+
schema: IDigitalEntitySchema,
145141
},
146142
[Collection.entity]: {
147143
guard: isEntity,
148-
schema: t.Union([IEntitySchema, IEntityResolvedOnlyDigitalEntitySchema, IEntityResolvedSchema]),
144+
schema: IEntitySchema,
149145
},
150146
[Collection.institution]: {
151147
guard: isInstitution,
152-
schema: t.Union([IInstitutionSchema, IInstitutionResolvedSchema]),
148+
schema: IInstitutionSchema,
153149
},
154150
[Collection.person]: {
155151
guard: isPerson,
156-
schema: t.Union([IPersonSchema, IPersonResolvedSchema]),
152+
schema: IPersonSchema,
157153
},
158154
[Collection.physicalentity]: {
159155
guard: isPhysicalEntity,
160-
schema: t.Union([IPhysicalEntitySchema, IPhysicalEntityResolvedSchema]),
156+
schema: IPhysicalEntitySchema,
161157
},
162158
[Collection.tag]: {
163159
guard: isTag,

0 commit comments

Comments
 (0)