@sideline/domain 0.9.0 → 0.11.0

package/src/api/EventSeriesApi.ts

@@ -1,13 +1,16 @@
 import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from '@effect/platform';
+import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
 import { AuthMiddleware } from '~/api/Auth.js';
 import { Forbidden } from '~/api/EventApi.js';
+import { Snowflake } from '~/models/Discord.js';
 import {
   DaysOfWeek,
   EventSeriesId,
   EventSeriesStatus,
   RecurrenceFrequency,
 } from '~/models/EventSeries.js';
+import { GroupId } from '~/models/GroupModel.js';
 import { TeamId } from '~/models/Team.js';
 import { TrainingTypeId } from '~/models/TrainingType.js';
 
@@ -17,33 +20,41 @@ export class EventSeriesInfo extends Schema.Class<EventSeriesInfo>('EventSeriesI
   title: Schema.String,
   frequency: RecurrenceFrequency,
   daysOfWeek: DaysOfWeek,
-  startDate: Schema.String,
-  endDate: Schema.NullOr(Schema.String),
+  startDate: Schemas.DateTimeFromIsoString,
+  endDate: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
   status: EventSeriesStatus,
-  trainingTypeId: Schema.NullOr(TrainingTypeId),
-  trainingTypeName: Schema.NullOr(Schema.String),
+  trainingTypeId: Schema.OptionFromNullOr(TrainingTypeId),
+  trainingTypeName: Schema.OptionFromNullOr(Schema.String),
   startTime: Schema.String,
-  endTime: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
-  discordChannelId: Schema.NullOr(Schema.String),
+  endTime: Schema.OptionFromNullOr(Schema.String),
+  location: Schema.OptionFromNullOr(Schema.String),
+  discordChannelId: Schema.OptionFromNullOr(Snowflake),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  ownerGroupName: Schema.OptionFromNullOr(Schema.String),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupName: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class EventSeriesDetail extends Schema.Class<EventSeriesDetail>('EventSeriesDetail')({
   seriesId: EventSeriesId,
   teamId: TeamId,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
   frequency: RecurrenceFrequency,
   daysOfWeek: DaysOfWeek,
-  startDate: Schema.String,
-  endDate: Schema.NullOr(Schema.String),
+  startDate: Schemas.DateTimeFromIsoString,
+  endDate: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
   status: EventSeriesStatus,
-  trainingTypeId: Schema.NullOr(TrainingTypeId),
-  trainingTypeName: Schema.NullOr(Schema.String),
+  trainingTypeId: Schema.OptionFromNullOr(TrainingTypeId),
+  trainingTypeName: Schema.OptionFromNullOr(Schema.String),
   startTime: Schema.String,
-  endTime: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
-  discordChannelId: Schema.NullOr(Schema.String),
+  endTime: Schema.OptionFromNullOr(Schema.String),
+  location: Schema.OptionFromNullOr(Schema.String),
+  discordChannelId: Schema.OptionFromNullOr(Snowflake),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  ownerGroupName: Schema.OptionFromNullOr(Schema.String),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupName: Schema.OptionFromNullOr(Schema.String),
   canEdit: Schema.Boolean,
   canCancel: Schema.Boolean,
 }) {}
@@ -52,16 +63,18 @@ export class CreateEventSeriesRequest extends Schema.Class<CreateEventSeriesRequ
   'CreateEventSeriesRequest',
 )({
   title: Schema.NonEmptyString,
-  trainingTypeId: Schema.NullOr(TrainingTypeId),
-  description: Schema.NullOr(Schema.String),
+  trainingTypeId: Schema.OptionFromNullOr(TrainingTypeId),
+  description: Schema.OptionFromNullOr(Schema.String),
   frequency: RecurrenceFrequency,
   daysOfWeek: DaysOfWeek,
-  startDate: Schema.String,
-  endDate: Schema.NullOr(Schema.String),
+  startDate: Schemas.DateTimeFromIsoString,
+  endDate: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
   startTime: Schema.String,
-  endTime: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
-  discordChannelId: Schema.NullOr(Schema.String),
+  endTime: Schema.OptionFromNullOr(Schema.String),
+  location: Schema.OptionFromNullOr(Schema.String),
+  discordChannelId: Schema.OptionFromNullOr(Snowflake),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
 }) {}
 
 export class UpdateEventSeriesRequest extends Schema.Class<UpdateEventSeriesRequest>(
@@ -74,8 +87,12 @@ export class UpdateEventSeriesRequest extends Schema.Class<UpdateEventSeriesRequ
   startTime: Schema.optionalWith(Schema.String, { as: 'Option' }),
   endTime: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
   location: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
-  endDate: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
-  discordChannelId: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
+  endDate: Schema.optionalWith(Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString), {
+    as: 'Option',
+  }),
+  discordChannelId: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), { as: 'Option' }),
+  ownerGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
+  memberGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
 }) {}
 
 export class EventSeriesNotFound extends Schema.TaggedError<EventSeriesNotFound>()(

package/src/api/GroupApi.ts

@@ -10,18 +10,18 @@ import { TeamMemberId } from '~/models/TeamMember.js';
 export class GroupInfo extends Schema.Class<GroupInfo>('GroupInfo')({
   groupId: GroupId,
   teamId: TeamId,
-  parentId: Schema.NullOr(GroupId),
+  parentId: Schema.OptionFromNullOr(GroupId),
   name: Schema.String,
-  emoji: Schema.NullOr(Schema.String),
+  emoji: Schema.OptionFromNullOr(Schema.String),
   memberCount: Schema.Number,
 }) {}
 
 export class GroupDetail extends Schema.Class<GroupDetail>('GroupDetail')({
   groupId: GroupId,
   teamId: TeamId,
-  parentId: Schema.NullOr(GroupId),
+  parentId: Schema.OptionFromNullOr(GroupId),
   name: Schema.String,
-  emoji: Schema.NullOr(Schema.String),
+  emoji: Schema.OptionFromNullOr(Schema.String),
   roles: Schema.Array(
     Schema.Struct({
       roleId: RoleId,
@@ -31,7 +31,7 @@ export class GroupDetail extends Schema.Class<GroupDetail>('GroupDetail')({
   members: Schema.Array(
     Schema.Struct({
       memberId: TeamMemberId,
-      name: Schema.NullOr(Schema.String),
+      name: Schema.OptionFromNullOr(Schema.String),
       username: Schema.String,
     }),
   ),
@@ -39,13 +39,13 @@ export class GroupDetail extends Schema.Class<GroupDetail>('GroupDetail')({
 
 export class CreateGroupRequest extends Schema.Class<CreateGroupRequest>('CreateGroupRequest')({
   name: Schema.NonEmptyString,
-  parentId: Schema.NullOr(GroupId),
-  emoji: Schema.NullOr(Schema.String),
+  parentId: Schema.OptionFromNullOr(GroupId),
+  emoji: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class UpdateGroupRequest extends Schema.Class<UpdateGroupRequest>('UpdateGroupRequest')({
   name: Schema.NonEmptyString,
-  emoji: Schema.NullOr(Schema.String),
+  emoji: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class AddGroupMemberRequest extends Schema.Class<AddGroupMemberRequest>(
@@ -61,13 +61,13 @@ export class AssignGroupRoleRequest extends Schema.Class<AssignGroupRoleRequest>
 }) {}
 
 export class MoveGroupRequest extends Schema.Class<MoveGroupRequest>('MoveGroupRequest')({
-  parentId: Schema.NullOr(GroupId),
+  parentId: Schema.OptionFromNullOr(GroupId),
 }) {}
 
 export class ChannelMappingInfo extends Schema.Class<ChannelMappingInfo>('ChannelMappingInfo')({
   discordChannelId: Snowflake,
-  discordChannelName: Schema.NullOr(Schema.String),
-  discordRoleId: Schema.NullOr(Snowflake),
+  discordChannelName: Schema.OptionFromNullOr(Schema.String),
+  discordRoleId: Schema.OptionFromNullOr(Snowflake),
 }) {}
 
 export class SetChannelMappingRequest extends Schema.Class<SetChannelMappingRequest>(
@@ -80,7 +80,7 @@ export class DiscordChannelInfo extends Schema.Class<DiscordChannelInfo>('Discor
   id: Snowflake,
   name: Schema.String,
   type: Schema.Number,
-  parentId: Schema.NullOr(Snowflake),
+  parentId: Schema.OptionFromNullOr(Snowflake),
 }) {}
 
 export class GroupNotFound extends Schema.TaggedError<GroupNotFound>()(
@@ -101,6 +101,12 @@ export class MemberNotFound extends Schema.TaggedError<MemberNotFound>()(
   HttpApiSchema.annotations({ status: 404 }),
 ) {}
 
+export class GroupNameAlreadyTaken extends Schema.TaggedError<GroupNameAlreadyTaken>()(
+  'GroupNameAlreadyTaken',
+  {},
+  HttpApiSchema.annotations({ status: 409 }),
+) {}
+
 export class GroupApiGroup extends HttpApiGroup.make('group')
   .add(
     HttpApiEndpoint.get('listGroups', '/teams/:teamId/groups')
@@ -113,6 +119,7 @@ export class GroupApiGroup extends HttpApiGroup.make('group')
     HttpApiEndpoint.post('createGroup', '/teams/:teamId/groups')
       .addSuccess(GroupInfo, { status: 201 })
       .addError(Forbidden, { status: 403 })
+      .addError(GroupNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId }))
       .setPayload(CreateGroupRequest)
       .middleware(AuthMiddleware),
@@ -130,6 +137,7 @@ export class GroupApiGroup extends HttpApiGroup.make('group')
       .addSuccess(GroupInfo)
       .addError(Forbidden, { status: 403 })
       .addError(GroupNotFound, { status: 404 })
+      .addError(GroupNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId, groupId: GroupId }))
       .setPayload(UpdateGroupRequest)
       .middleware(AuthMiddleware),
@@ -189,7 +197,7 @@ export class GroupApiGroup extends HttpApiGroup.make('group')
   )
   .add(
     HttpApiEndpoint.get('getChannelMapping', '/teams/:teamId/groups/:groupId/channel-mapping')
-      .addSuccess(Schema.NullOr(ChannelMappingInfo))
+      .addSuccess(Schema.OptionFromNullOr(ChannelMappingInfo))
       .addError(Forbidden, { status: 403 })
       .addError(GroupNotFound, { status: 404 })
       .setPath(Schema.Struct({ teamId: TeamId, groupId: GroupId }))

package/src/api/ICalApi.ts

@@ -0,0 +1,32 @@
+import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from '@effect/platform';
+import { Schema } from 'effect';
+import { AuthMiddleware } from '~/api/Auth.js';
+
+export class ICalTokenResponse extends Schema.Class<ICalTokenResponse>('ICalTokenResponse')({
+  token: Schema.String,
+  url: Schema.String,
+}) {}
+
+export class ICalTokenNotFound extends Schema.TaggedError<ICalTokenNotFound>()(
+  'ICalTokenNotFound',
+  {},
+  HttpApiSchema.annotations({ status: 404 }),
+) {}
+
+export class ICalApiGroup extends HttpApiGroup.make('ical')
+  .add(
+    HttpApiEndpoint.get('getICalToken', '/me/ical-token')
+      .addSuccess(ICalTokenResponse)
+      .middleware(AuthMiddleware),
+  )
+  .add(
+    HttpApiEndpoint.post('regenerateICalToken', '/me/ical-token/regenerate')
+      .addSuccess(ICalTokenResponse)
+      .middleware(AuthMiddleware),
+  )
+  .add(
+    HttpApiEndpoint.get('getICalFeed', '/ical/:token')
+      .addSuccess(Schema.Void)
+      .addError(ICalTokenNotFound, { status: 404 })
+      .setPath(Schema.Struct({ token: Schema.String })),
+  ) {}

package/src/api/RoleApi.ts

@@ -13,12 +13,18 @@ export class RoleInfo extends Schema.Class<RoleInfo>('RoleInfo')({
   permissionCount: Schema.Number,
 }) {}
 
+export class RoleListResponse extends Schema.Class<RoleListResponse>('RoleListResponse')({
+  canManage: Schema.Boolean,
+  roles: Schema.Array(RoleInfo),
+}) {}
+
 export class RoleDetail extends Schema.Class<RoleDetail>('RoleDetail')({
   roleId: RoleId,
   teamId: TeamId,
   name: Schema.String,
   isBuiltIn: Schema.Boolean,
   permissions: Schema.Array(Permission),
+  canManage: Schema.Boolean,
 }) {}
 
 export class CreateRoleRequest extends Schema.Class<CreateRoleRequest>('CreateRoleRequest')({
@@ -27,8 +33,8 @@ export class CreateRoleRequest extends Schema.Class<CreateRoleRequest>('CreateRo
 }) {}
 
 export class UpdateRoleRequest extends Schema.Class<UpdateRoleRequest>('UpdateRoleRequest')({
-  name: Schema.NullOr(Schema.NonEmptyString),
-  permissions: Schema.NullOr(Schema.Array(Permission)),
+  name: Schema.OptionFromNullOr(Schema.NonEmptyString),
+  permissions: Schema.OptionFromNullOr(Schema.Array(Permission)),
 }) {}
 
 export class RoleNotFound extends Schema.TaggedError<RoleNotFound>()(
@@ -65,10 +71,16 @@ export class RoleInUse extends Schema.TaggedError<RoleInUse>()(
   HttpApiSchema.annotations({ status: 409 }),
 ) {}
 
+export class RoleNameAlreadyTaken extends Schema.TaggedError<RoleNameAlreadyTaken>()(
+  'RoleNameAlreadyTaken',
+  {},
+  HttpApiSchema.annotations({ status: 409 }),
+) {}
+
 export class RoleApiGroup extends HttpApiGroup.make('role')
   .add(
     HttpApiEndpoint.get('listRoles', '/teams/:teamId/roles')
-      .addSuccess(Schema.Array(RoleInfo))
+      .addSuccess(RoleListResponse)
       .addError(Forbidden, { status: 403 })
       .setPath(Schema.Struct({ teamId: TeamId }))
       .middleware(AuthMiddleware),
@@ -77,6 +89,7 @@ export class RoleApiGroup extends HttpApiGroup.make('role')
     HttpApiEndpoint.post('createRole', '/teams/:teamId/roles')
       .addSuccess(RoleDetail, { status: 201 })
       .addError(Forbidden, { status: 403 })
+      .addError(RoleNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId }))
       .setPayload(CreateRoleRequest)
       .middleware(AuthMiddleware),
@@ -95,6 +108,7 @@ export class RoleApiGroup extends HttpApiGroup.make('role')
       .addError(Forbidden, { status: 403 })
       .addError(RoleNotFound, { status: 404 })
       .addError(CannotModifyBuiltIn, { status: 400 })
+      .addError(RoleNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId, roleId: RoleId }))
       .setPayload(UpdateRoleRequest)
       .middleware(AuthMiddleware),

package/src/api/Roster.ts

@@ -13,19 +13,19 @@ export class RosterPlayer extends Schema.Class<RosterPlayer>('RosterPlayer')({
   discordId: Schema.String,
   roleNames: Schema.Array(Schema.String),
   permissions: Schema.Array(Permission),
-  name: Schema.NullOr(Schema.String),
-  birthDate: Schema.NullOr(Schema.String),
-  gender: Schema.NullOr(Gender),
-  jerseyNumber: Schema.NullOr(Schema.Number),
+  name: Schema.OptionFromNullOr(Schema.String),
+  birthDate: Schema.OptionFromNullOr(Schema.String),
+  gender: Schema.OptionFromNullOr(Gender),
+  jerseyNumber: Schema.OptionFromNullOr(Schema.Number),
   username: Schema.String,
-  avatar: Schema.NullOr(Schema.String),
+  avatar: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class UpdatePlayerRequest extends Schema.Class<UpdatePlayerRequest>('UpdatePlayerRequest')({
-  name: Schema.NullOr(Schema.String),
+  name: Schema.OptionFromNullOr(Schema.String),
   birthDate: Schema.OptionFromNullOr(Schema.String),
-  gender: Schema.NullOr(Gender),
-  jerseyNumber: Schema.NullOr(Schema.Number),
+  gender: Schema.OptionFromNullOr(Gender),
+  jerseyNumber: Schema.OptionFromNullOr(Schema.Number),
 }) {}
 
 export class PlayerNotFound extends Schema.TaggedError<PlayerNotFound>()(
@@ -55,6 +55,11 @@ export class RosterInfo extends Schema.Class<RosterInfo>('RosterInfo')({
   createdAt: Schema.String,
 }) {}
 
+export class RosterListResponse extends Schema.Class<RosterListResponse>('RosterListResponse')({
+  canManage: Schema.Boolean,
+  rosters: Schema.Array(RosterInfo),
+}) {}
+
 export class RosterDetail extends Schema.Class<RosterDetail>('RosterDetail')({
   rosterId: RosterId,
   teamId: TeamId,
@@ -62,6 +67,7 @@ export class RosterDetail extends Schema.Class<RosterDetail>('RosterDetail')({
   active: Schema.Boolean,
   createdAt: Schema.String,
   members: Schema.Array(RosterPlayer),
+  canManage: Schema.Boolean,
 }) {}
 
 export class CreateRosterRequest extends Schema.Class<CreateRosterRequest>('CreateRosterRequest')({
@@ -69,8 +75,8 @@ export class CreateRosterRequest extends Schema.Class<CreateRosterRequest>('Crea
 }) {}
 
 export class UpdateRosterRequest extends Schema.Class<UpdateRosterRequest>('UpdateRosterRequest')({
-  name: Schema.NullOr(Schema.String),
-  active: Schema.NullOr(Schema.Boolean),
+  name: Schema.OptionFromNullOr(Schema.String),
+  active: Schema.OptionFromNullOr(Schema.Boolean),
 }) {}
 
 export class AddRosterMemberRequest extends Schema.Class<AddRosterMemberRequest>(
@@ -114,7 +120,7 @@ export class RosterApiGroup extends HttpApiGroup.make('roster')
   )
   .add(
     HttpApiEndpoint.get('listRosters', '/teams/:teamId/rosters')
-      .addSuccess(Schema.Array(RosterInfo))
+      .addSuccess(RosterListResponse)
       .addError(Forbidden, { status: 403 })
       .setPath(Schema.Struct({ teamId: TeamId }))
       .middleware(AuthMiddleware),

package/src/api/TeamSettingsApi.ts

@@ -2,6 +2,7 @@ import { HttpApiEndpoint, HttpApiGroup } from '@effect/platform';
 import { Schema } from 'effect';
 import { AuthMiddleware } from '~/api/Auth.js';
 import { Forbidden } from '~/api/EventApi.js';
+import { Snowflake } from '~/models/Discord.js';
 import { TeamId } from '~/models/Team.js';
 
 export class TeamSettingsInfo extends Schema.Class<TeamSettingsInfo>('TeamSettingsInfo')({
@@ -9,12 +10,12 @@ export class TeamSettingsInfo extends Schema.Class<TeamSettingsInfo>('TeamSettin
   eventHorizonDays: Schema.Int,
   minPlayersThreshold: Schema.Int,
   rsvpReminderHours: Schema.Int,
-  discordChannelTraining: Schema.NullOr(Schema.String),
-  discordChannelMatch: Schema.NullOr(Schema.String),
-  discordChannelTournament: Schema.NullOr(Schema.String),
-  discordChannelMeeting: Schema.NullOr(Schema.String),
-  discordChannelSocial: Schema.NullOr(Schema.String),
-  discordChannelOther: Schema.NullOr(Schema.String),
+  discordChannelTraining: Schema.OptionFromNullOr(Snowflake),
+  discordChannelMatch: Schema.OptionFromNullOr(Snowflake),
+  discordChannelTournament: Schema.OptionFromNullOr(Snowflake),
+  discordChannelMeeting: Schema.OptionFromNullOr(Snowflake),
+  discordChannelSocial: Schema.OptionFromNullOr(Snowflake),
+  discordChannelOther: Schema.OptionFromNullOr(Snowflake),
 }) {}
 
 export class UpdateTeamSettingsRequest extends Schema.Class<UpdateTeamSettingsRequest>(
@@ -27,22 +28,22 @@ export class UpdateTeamSettingsRequest extends Schema.Class<UpdateTeamSettingsRe
   rsvpReminderHours: Schema.optionalWith(Schema.Int.pipe(Schema.between(0, 168)), {
     as: 'Option',
   }),
-  discordChannelTraining: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelTraining: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
-  discordChannelMatch: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelMatch: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
-  discordChannelTournament: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelTournament: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
-  discordChannelMeeting: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelMeeting: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
-  discordChannelSocial: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelSocial: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
-  discordChannelOther: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
+  discordChannelOther: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), {
     as: 'Option',
   }),
 }) {}

package/src/api/TrainingTypeApi.ts

@@ -1,6 +1,7 @@
 import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from '@effect/platform';
 import { Schema } from 'effect';
 import { AuthMiddleware } from '~/api/Auth.js';
+import { Snowflake } from '~/models/Discord.js';
 import { GroupId } from '~/models/GroupModel.js';
 import { TeamId } from '~/models/Team.js';
 import { TrainingTypeId } from '~/models/TrainingType.js';
@@ -9,16 +10,19 @@ export class TrainingTypeInfo extends Schema.Class<TrainingTypeInfo>('TrainingTy
   trainingTypeId: TrainingTypeId,
   teamId: TeamId,
   name: Schema.String,
-  groupName: Schema.NullOr(Schema.String),
+  ownerGroupName: Schema.OptionFromNullOr(Schema.String),
+  memberGroupName: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class TrainingTypeDetail extends Schema.Class<TrainingTypeDetail>('TrainingTypeDetail')({
   trainingTypeId: TrainingTypeId,
   teamId: TeamId,
   name: Schema.String,
-  groupId: Schema.NullOr(GroupId),
-  groupName: Schema.NullOr(Schema.String),
-  discordChannelId: Schema.NullOr(Schema.String),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  ownerGroupName: Schema.OptionFromNullOr(Schema.String),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupName: Schema.OptionFromNullOr(Schema.String),
+  discordChannelId: Schema.OptionFromNullOr(Snowflake),
   canAdmin: Schema.Boolean,
 }) {}
 
@@ -33,15 +37,18 @@ export class CreateTrainingTypeRequest extends Schema.Class<CreateTrainingTypeRe
   'CreateTrainingTypeRequest',
 )({
   name: Schema.NonEmptyString,
-  groupId: Schema.NullOr(GroupId),
-  discordChannelId: Schema.NullOr(Schema.String),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
+  discordChannelId: Schema.OptionFromNullOr(Snowflake),
 }) {}
 
 export class UpdateTrainingTypeRequest extends Schema.Class<UpdateTrainingTypeRequest>(
   'UpdateTrainingTypeRequest',
 )({
   name: Schema.NonEmptyString,
-  discordChannelId: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
+  ownerGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
+  memberGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
+  discordChannelId: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), { as: 'Option' }),
 }) {}
 
 export class TrainingTypeNotFound extends Schema.TaggedError<TrainingTypeNotFound>()(
@@ -56,6 +63,12 @@ export class Forbidden extends Schema.TaggedError<Forbidden>()(
   HttpApiSchema.annotations({ status: 403 }),
 ) {}
 
+export class TrainingTypeNameAlreadyTaken extends Schema.TaggedError<TrainingTypeNameAlreadyTaken>()(
+  'TrainingTypeNameAlreadyTaken',
+  {},
+  HttpApiSchema.annotations({ status: 409 }),
+) {}
+
 export class TrainingTypeApiGroup extends HttpApiGroup.make('trainingType')
   .add(
     HttpApiEndpoint.get('listTrainingTypes', '/teams/:teamId/training-types')
@@ -68,6 +81,7 @@ export class TrainingTypeApiGroup extends HttpApiGroup.make('trainingType')
     HttpApiEndpoint.post('createTrainingType', '/teams/:teamId/training-types')
       .addSuccess(TrainingTypeInfo, { status: 201 })
       .addError(Forbidden, { status: 403 })
+      .addError(TrainingTypeNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId }))
       .setPayload(CreateTrainingTypeRequest)
       .middleware(AuthMiddleware),
@@ -85,6 +99,7 @@ export class TrainingTypeApiGroup extends HttpApiGroup.make('trainingType')
       .addSuccess(TrainingTypeInfo)
       .addError(Forbidden, { status: 403 })
       .addError(TrainingTypeNotFound, { status: 404 })
+      .addError(TrainingTypeNameAlreadyTaken, { status: 409 })
       .setPath(Schema.Struct({ teamId: TeamId, trainingTypeId: TrainingTypeId }))
       .setPayload(UpdateTrainingTypeRequest)
       .middleware(AuthMiddleware),

package/src/index.ts

@@ -12,6 +12,8 @@ export * as EventSeriesApi from './api/EventSeriesApi.js';
 
 export * as GroupApi from './api/GroupApi.js';
 
+export * as ICalApi from './api/ICalApi.js';
+
 export * as Invite from './api/Invite.js';
 
 export * as NotificationApi from './api/NotificationApi.js';
@@ -42,6 +44,8 @@ export * as EventSeries from './models/EventSeries.js';
 
 export * as GroupModel from './models/GroupModel.js';
 
+export * as ICalToken from './models/ICalToken.js';
+
 export * as MemberRole from './models/MemberRole.js';
 
 export * as Notification from './models/Notification.js';

package/src/models/AgeThresholdRule.ts

@@ -10,7 +10,7 @@ export class AgeThresholdRule extends Model.Class<AgeThresholdRule>('AgeThreshol
   id: Model.Generated(AgeThresholdRuleId),
   team_id: TeamId,
   group_id: GroupId,
-  min_age: Schema.NullOr(Schema.Number),
-  max_age: Schema.NullOr(Schema.Number),
+  min_age: Schema.OptionFromNullOr(Schema.Number),
+  max_age: Schema.OptionFromNullOr(Schema.Number),
   created_at: Model.DateTimeInsertFromDate,
 }) {}

package/src/models/ChannelSyncEvent.ts

@@ -21,10 +21,10 @@ export class ChannelSyncEvent extends Model.Class<ChannelSyncEvent>('ChannelSync
   guild_id: Schema.String,
   event_type: ChannelSyncEventType,
   group_id: GroupId,
-  group_name: Schema.NullOr(Schema.String),
-  team_member_id: Schema.NullOr(TeamMemberId),
-  discord_user_id: Schema.NullOr(Schema.String),
-  processed_at: Schema.NullOr(Schema.String),
-  error: Schema.NullOr(Schema.String),
+  group_name: Schema.OptionFromNullOr(Schema.String),
+  team_member_id: Schema.OptionFromNullOr(TeamMemberId),
+  discord_user_id: Schema.OptionFromNullOr(Schema.String),
+  processed_at: Schema.OptionFromNullOr(Schema.String),
+  error: Schema.OptionFromNullOr(Schema.String),
   created_at: Model.DateTimeInsertFromDate,
 }) {}

package/src/models/Event.ts

@@ -2,6 +2,7 @@ import { Model } from '@effect/sql';
 import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
 import { EventSeriesId } from '~/models/EventSeries.js';
+import { GroupId } from '~/models/GroupModel.js';
 import { TeamId } from '~/models/Team.js';
 import { TeamMemberId } from '~/models/TeamMember.js';
 import { TrainingTypeId } from '~/models/TrainingType.js';
@@ -25,14 +26,16 @@ export type EventStatus = typeof EventStatus.Type;
 export class Event extends Model.Class<Event>('Event')({
   id: Model.Generated(EventId),
   team_id: TeamId,
-  training_type_id: Schema.NullOr(TrainingTypeId),
+  training_type_id: Schema.OptionFromNullOr(TrainingTypeId),
   event_type: EventType,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
   start_at: Schemas.DateTimeFromDate,
-  end_at: Schema.NullOr(Schemas.DateTimeFromDate),
-  location: Schema.NullOr(Schema.String),
-  series_id: Schema.NullOr(EventSeriesId),
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromDate),
+  location: Schema.OptionFromNullOr(Schema.String),
+  owner_group_id: Schema.OptionFromNullOr(GroupId),
+  member_group_id: Schema.OptionFromNullOr(GroupId),
+  series_id: Schema.OptionFromNullOr(EventSeriesId),
   series_modified: Schema.Boolean,
   status: Model.FieldExcept('update')(EventStatus),
   created_by: TeamMemberId,

package/src/models/EventRsvp.ts

@@ -14,7 +14,7 @@ export class EventRsvp extends Model.Class<EventRsvp>('EventRsvp')({
   event_id: EventId,
   team_member_id: TeamMemberId,
   response: RsvpResponse,
-  message: Schema.NullOr(Schema.String),
+  message: Schema.OptionFromNullOr(Schema.String),
   created_at: Model.DateTimeInsertFromDate,
   updated_at: Model.DateTimeUpdateFromDate,
 }) {}

package/src/models/EventSeries.ts

@@ -1,5 +1,6 @@
 import { Model } from '@effect/sql';
 import { Schema } from 'effect';
+import { GroupId } from '~/models/GroupModel.js';
 import { TeamId } from '~/models/Team.js';
 import { TeamMemberId } from '~/models/TeamMember.js';
 import { TrainingTypeId } from '~/models/TrainingType.js';
@@ -22,16 +23,18 @@ export type EventSeriesStatus = typeof EventSeriesStatus.Type;
 export class EventSeries extends Model.Class<EventSeries>('EventSeries')({
   id: Model.Generated(EventSeriesId),
   team_id: TeamId,
-  training_type_id: Schema.NullOr(TrainingTypeId),
+  training_type_id: Schema.OptionFromNullOr(TrainingTypeId),
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
   start_time: Schema.String,
-  end_time: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
+  end_time: Schema.OptionFromNullOr(Schema.String),
+  location: Schema.OptionFromNullOr(Schema.String),
   frequency: RecurrenceFrequency,
   days_of_week: DaysOfWeek,
   start_date: Schema.DateFromSelf,
-  end_date: Schema.NullOr(Schema.DateFromSelf),
+  end_date: Schema.OptionFromNullOr(Schema.DateFromSelf),
+  owner_group_id: Schema.OptionFromNullOr(GroupId),
+  member_group_id: Schema.OptionFromNullOr(GroupId),
   status: Model.FieldExcept('update')(EventSeriesStatus),
   created_by: TeamMemberId,
   created_at: Model.DateTimeInsertFromDate,

package/src/models/GroupModel.ts

@@ -8,8 +8,8 @@ export type GroupId = typeof GroupId.Type;
 export class Group extends Model.Class<Group>('Group')({
   id: Model.Generated(GroupId),
   team_id: TeamId,
-  parent_id: Schema.NullOr(GroupId),
+  parent_id: Schema.OptionFromNullOr(GroupId),
   name: Schema.String,
-  emoji: Schema.NullOr(Schema.String),
+  emoji: Schema.OptionFromNullOr(Schema.String),
   created_at: Model.DateTimeInsertFromDate,
 }) {}