@sideline/domain 0.10.0 → 0.11.0

package/src/api/Roster.ts

@@ -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')({
@@ -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/TrainingTypeApi.ts

@@ -10,15 +10,18 @@ export class TrainingTypeInfo extends Schema.Class<TrainingTypeInfo>('TrainingTy
   trainingTypeId: TrainingTypeId,
   teamId: TeamId,
   name: Schema.String,
-  groupName: Schema.OptionFromNullOr(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.OptionFromNullOr(GroupId),
-  groupName: Schema.OptionFromNullOr(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,
 }) {}
@@ -34,7 +37,8 @@ export class CreateTrainingTypeRequest extends Schema.Class<CreateTrainingTypeRe
   'CreateTrainingTypeRequest',
 )({
   name: Schema.NonEmptyString,
-  groupId: Schema.OptionFromNullOr(GroupId),
+  ownerGroupId: Schema.OptionFromNullOr(GroupId),
+  memberGroupId: Schema.OptionFromNullOr(GroupId),
   discordChannelId: Schema.OptionFromNullOr(Snowflake),
 }) {}
 
@@ -42,6 +46,8 @@ export class UpdateTrainingTypeRequest extends Schema.Class<UpdateTrainingTypeRe
   'UpdateTrainingTypeRequest',
 )({
   name: Schema.NonEmptyString,
+  ownerGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
+  memberGroupId: Schema.optionalWith(Schema.OptionFromNullOr(GroupId), { as: 'Option' }),
   discordChannelId: Schema.optionalWith(Schema.OptionFromNullOr(Snowflake), { as: 'Option' }),
 }) {}
 

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';
@@ -32,6 +33,8 @@ export class Event extends Model.Class<Event>('Event')({
   start_at: Schemas.DateTimeFromDate,
   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),

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';
@@ -32,6 +33,8 @@ export class EventSeries extends Model.Class<EventSeries>('EventSeries')({
   days_of_week: DaysOfWeek,
   start_date: 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/TrainingType.ts

@@ -10,6 +10,7 @@ export class TrainingType extends Model.Class<TrainingType>('TrainingType')({
   id: Model.Generated(TrainingTypeId),
   team_id: TeamId,
   name: Schema.String,
-  group_id: Schema.OptionFromNullOr(GroupId),
+  owner_group_id: Schema.OptionFromNullOr(GroupId),
+  member_group_id: Schema.OptionFromNullOr(GroupId),
   created_at: Model.DateTimeInsertFromDate,
 }) {}

package/src/rpc/event/EventRpcGroup.ts

@@ -17,6 +17,7 @@ import {
   RsvpDeadlinePassed,
   RsvpEventNotFound,
   RsvpMemberNotFound,
+  RsvpNotGroupMember,
   RsvpReminderSummary,
 } from './EventRpcModels.js';
 
@@ -51,7 +52,12 @@ export const EventRpcGroup = RpcGroup.make(
       message: Schema.OptionFromNullOr(Schema.String),
     },
     success: RsvpCountsResult,
-    error: Schema.Union(RsvpMemberNotFound, RsvpDeadlinePassed, RsvpEventNotFound),
+    error: Schema.Union(
+      RsvpMemberNotFound,
+      RsvpDeadlinePassed,
+      RsvpEventNotFound,
+      RsvpNotGroupMember,
+    ),
   }),
   Rpc.make('GetRsvpCounts', {
     payload: { event_id: Event.EventId },

package/src/rpc/event/EventRpcModels.ts

@@ -51,6 +51,11 @@ export class RsvpEventNotFound extends Schema.TaggedError<RsvpEventNotFound>()(
   {},
 ) {}
 
+export class RsvpNotGroupMember extends Schema.TaggedError<RsvpNotGroupMember>()(
+  'RsvpNotGroupMember',
+  {},
+) {}
+
 export class CreateEventNotMember extends Schema.TaggedError<CreateEventNotMember>()(
   'CreateEventNotMember',
   {},