Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Changes to fix uuid being set for type properties #9331

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Changes to fix uuid being set for type properties #9331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/engine/src/schemas/networking/instance-provision.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const instanceProvisionSchema = Type.Object(
}),
ipAddress: Type.String(),
port: Type.String(),
roomCode: TypedString<RoomCode>({ format: 'uuid' }),
roomCode: TypedString<RoomCode>(),
podName: Type.Optional(Type.String())
},
{ $id: 'InstanceProvision', additionalProperties: false }
Expand Down
2 changes: 1 addition & 1 deletion packages/engine/src/schemas/networking/instance.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const instanceSchema = Type.Object(
id: TypedString<InstanceID>({
format: 'uuid'
}),
roomCode: TypedString<RoomCode>({ format: 'uuid' }),
roomCode: TypedString<RoomCode>(),
ipAddress: Type.Optional(Type.String()),
channelId: Type.Optional(
TypedString<ChannelID>({
Expand Down
6 changes: 1 addition & 5 deletions packages/engine/src/schemas/projects/project-permission.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ export const projectPermissionDataSchema = Type.Intersect(
[
projectPermissionDataProperties,
Type.Object({
inviteCode: Type.Optional(
TypedString<InviteCode>({
format: 'uuid'
})
)
inviteCode: Type.Optional(TypedString<InviteCode>())
})
],
{
Expand Down
4 changes: 1 addition & 3 deletions packages/engine/src/schemas/scope/scope-type.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ export const scopeTypeMethods = ['find', 'get'] as const
// Main data model schema
export const scopeTypeSchema = Type.Object(
{
type: TypedString<ScopeType>({
format: 'uuid'
}),
type: TypedString<ScopeType>(),
createdAt: Type.String({ format: 'date-time' }),
updatedAt: Type.String({ format: 'date-time' })
},
Expand Down
4 changes: 1 addition & 3 deletions packages/engine/src/schemas/scope/scope.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ export const scopeSchema = Type.Object(
id: TypedString<ScopeID>({
format: 'uuid'
}),
type: TypedString<ScopeType>({
format: 'uuid'
}),
type: TypedString<ScopeType>(),
userId: TypedString<UserID>({
format: 'uuid'
}),
Expand Down
4 changes: 1 addition & 3 deletions packages/engine/src/schemas/social/invite-code-lookup.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ export const inviteCodeLookupSchema = Type.Object(
id: TypedString<UserID>({
format: 'uuid'
}),
inviteCode: TypedString<InviteCode>({
format: 'uuid'
}),
inviteCode: TypedString<InviteCode>(),
instanceAttendance: Type.Array(Type.Ref(instanceAttendanceSchema))
},
{ $id: 'InviteCodeLookup', additionalProperties: false }
Expand Down
14 changes: 3 additions & 11 deletions packages/engine/src/schemas/user/user.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ export const userMethods = ['get', 'find', 'create', 'patch', 'remove'] as const

export const userScopeSchema = Type.Object(
{
type: TypedString<ScopeType>({
format: 'uuid'
})
type: TypedString<ScopeType>()
},
{ $id: 'UserScope', additionalProperties: false }
)
Expand All @@ -61,15 +59,9 @@ export const userSchema = Type.Object(
id: TypedString<UserID>({
format: 'uuid'
}),
name: TypedString<UserName>({
format: 'uuid'
}),
name: TypedString<UserName>(),
isGuest: Type.Boolean(),
inviteCode: Type.Optional(
TypedString<InviteCode>({
format: 'uuid'
})
),
inviteCode: Type.Optional(TypedString<InviteCode>()),
avatarId: TypedString<AvatarID>({
format: 'uuid'
}),
Expand Down