@sideline/domain 0.9.0 → 0.11.0

package/src/models/ICalToken.ts

@@ -0,0 +1,10 @@
+import { Model } from '@effect/sql';
+import { Schema } from 'effect';
+import { UserId } from '~/models/User.js';
+
+export class ICalToken extends Model.Class<ICalToken>('ICalToken')({
+  id: Model.Generated(Schema.String),
+  user_id: UserId,
+  token: Schema.String,
+  created_at: Model.DateTimeInsertFromDate,
+}) {}

package/src/models/OAuthConnection.ts

@@ -10,7 +10,7 @@ export class OAuthConnection extends Model.Class<OAuthConnection>('OAuthConnecti
   user_id: UserId,
   provider: Schema.String,
   access_token: Model.Sensitive(Schema.String),
-  refresh_token: Model.Sensitive(Schema.NullOr(Schema.String)),
+  refresh_token: Model.Sensitive(Schema.OptionFromNullOr(Schema.String)),
   created_at: Model.DateTimeInsertFromDate,
   updated_at: Model.DateTimeUpdateFromDate,
 }) {}

package/src/models/RoleSyncEvent.ts

@@ -21,10 +21,10 @@ export class RoleSyncEvent extends Model.Class<RoleSyncEvent>('RoleSyncEvent')({
   guild_id: Schema.String,
   event_type: RoleSyncEventType,
   role_id: RoleId,
-  role_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),
+  role_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/TeamInvite.ts

@@ -14,5 +14,5 @@ export class TeamInvite extends Model.Class<TeamInvite>('TeamInvite')({
   active: Schema.Boolean,
   created_by: UserId,
   created_at: Model.DateTimeInsertFromDate,
-  expires_at: Schema.NullOr(Schemas.DateTimeFromDate),
+  expires_at: Schema.OptionFromNullOr(Schemas.DateTimeFromDate),
 }) {}

package/src/models/TeamMember.ts

@@ -11,6 +11,6 @@ export class TeamMember extends Model.Class<TeamMember>('TeamMember')({
   team_id: TeamId,
   user_id: UserId,
   active: Schema.Boolean,
-  jersey_number: Model.FieldExcept('insert')(Schema.NullOr(Schema.Number)),
+  jersey_number: Model.FieldExcept('insert')(Schema.OptionFromNullOr(Schema.Number)),
   joined_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.NullOr(GroupId),
+  owner_group_id: Schema.OptionFromNullOr(GroupId),
+  member_group_id: Schema.OptionFromNullOr(GroupId),
   created_at: Model.DateTimeInsertFromDate,
 }) {}

package/src/models/User.ts

@@ -1,6 +1,7 @@
 import { Model } from '@effect/sql';
 import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
+import { Snowflake } from '~/models/Discord.js';
 
 export const UserId = Schema.String.pipe(Schema.brand('UserId'));
 export type UserId = typeof UserId.Type;
@@ -13,12 +14,12 @@ export type Locale = typeof Locale.Type;
 
 export class User extends Model.Class<User>('User')({
   id: Model.Generated(UserId),
-  discord_id: Schema.String,
+  discord_id: Snowflake,
   username: Schema.String,
-  avatar: Schema.NullOr(Schema.String),
-  name: Schema.NullOr(Schema.String),
+  avatar: Schema.OptionFromNullOr(Schema.String),
+  name: Schema.OptionFromNullOr(Schema.String),
   birth_date: Schema.OptionFromNullOr(Schemas.DateTimeFromDate),
-  gender: Schema.NullOr(Gender),
+  gender: Schema.OptionFromNullOr(Gender),
   locale: Locale,
   created_at: Model.DateTimeInsertFromDate,
   is_profile_complete: Schema.Boolean,

package/src/rpc/event/EventRpcEvents.ts

@@ -1,3 +1,4 @@
+import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
 import { Discord, Event, Team } from '~/index.js';
 
@@ -7,12 +8,12 @@ export class EventCreatedEvent extends Schema.TaggedClass<EventCreatedEvent>()('
   guild_id: Discord.Snowflake,
   event_id: Event.EventId,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
-  discord_channel_id: Schema.NullOr(Schema.String),
+  discord_channel_id: Schema.OptionFromNullOr(Discord.Snowflake),
 }) {}
 
 export class EventUpdatedEvent extends Schema.TaggedClass<EventUpdatedEvent>()('event_updated', {
@@ -21,12 +22,12 @@ export class EventUpdatedEvent extends Schema.TaggedClass<EventUpdatedEvent>()('
   guild_id: Discord.Snowflake,
   event_id: Event.EventId,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
-  discord_channel_id: Schema.NullOr(Schema.String),
+  discord_channel_id: Schema.OptionFromNullOr(Discord.Snowflake),
 }) {}
 
 export class EventCancelledEvent extends Schema.TaggedClass<EventCancelledEvent>()(
@@ -45,8 +46,8 @@ export class RsvpReminderEvent extends Schema.TaggedClass<RsvpReminderEvent>()('
   guild_id: Discord.Snowflake,
   event_id: Event.EventId,
   title: Schema.String,
-  start_at: Schema.String,
-  discord_channel_id: Schema.NullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  discord_channel_id: Schema.OptionFromNullOr(Discord.Snowflake),
 }) {}
 
 export const UnprocessedEventSyncEvent = Schema.Union(

package/src/rpc/event/EventRpcGroup.ts

@@ -10,11 +10,14 @@ import {
   CreateEventResult,
   EventDiscordMessage,
   EventEmbedInfo,
+  GuildEventListResult,
+  GuildNotFound,
   RsvpAttendeesResult,
   RsvpCountsResult,
   RsvpDeadlinePassed,
   RsvpEventNotFound,
   RsvpMemberNotFound,
+  RsvpNotGroupMember,
   RsvpReminderSummary,
 } from './EventRpcModels.js';
 
@@ -32,8 +35,8 @@ export const EventRpcGroup = RpcGroup.make(
   Rpc.make('SaveDiscordMessageId', {
     payload: {
       event_id: Event.EventId,
-      discord_channel_id: Schema.String,
-      discord_message_id: Schema.String,
+      discord_channel_id: Discord.Snowflake,
+      discord_message_id: Discord.Snowflake,
     },
   }),
   Rpc.make('GetDiscordMessageId', {
@@ -46,10 +49,15 @@ export const EventRpcGroup = RpcGroup.make(
       team_id: Team.TeamId,
       discord_user_id: Discord.Snowflake,
       response: EventRsvp.RsvpResponse,
-      message: Schema.NullOr(Schema.String),
+      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 },
@@ -60,7 +68,7 @@ export const EventRpcGroup = RpcGroup.make(
     success: Schema.OptionFromNullOr(EventEmbedInfo),
   }),
   Rpc.make('GetChannelEvents', {
-    payload: { discord_channel_id: Schema.String },
+    payload: { discord_channel_id: Discord.Snowflake },
     success: Schema.Array(ChannelEventEntry),
   }),
   Rpc.make('GetRsvpAttendees', {
@@ -71,6 +79,15 @@ export const EventRpcGroup = RpcGroup.make(
     payload: { event_id: Event.EventId },
     success: RsvpReminderSummary,
   }),
+  Rpc.make('GetUpcomingGuildEvents', {
+    payload: {
+      guild_id: Discord.Snowflake,
+      offset: Schema.Number,
+      limit: Schema.Number,
+    },
+    success: GuildEventListResult,
+    error: GuildNotFound,
+  }),
   Rpc.make('CreateEvent', {
     payload: {
       guild_id: Discord.Snowflake,
@@ -78,9 +95,9 @@ export const EventRpcGroup = RpcGroup.make(
       event_type: Event.EventType,
       title: Schema.String,
       start_at: Schema.String,
-      end_at: Schema.NullOr(Schema.String),
-      location: Schema.NullOr(Schema.String),
-      description: Schema.NullOr(Schema.String),
+      end_at: Schema.OptionFromNullOr(Schema.String),
+      location: Schema.OptionFromNullOr(Schema.String),
+      description: Schema.OptionFromNullOr(Schema.String),
     },
     success: CreateEventResult,
     error: Schema.Union(CreateEventNotMember, CreateEventForbidden, CreateEventInvalidDate),

package/src/rpc/event/EventRpcModels.ts

@@ -1,8 +1,10 @@
+import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
+import { Snowflake } from '~/models/Discord.js';
 
 export class EventDiscordMessage extends Schema.Class<EventDiscordMessage>('EventDiscordMessage')({
-  discord_channel_id: Schema.String,
-  discord_message_id: Schema.String,
+  discord_channel_id: Snowflake,
+  discord_message_id: Snowflake,
 }) {}
 
 export class RsvpCountsResult extends Schema.Class<RsvpCountsResult>('RsvpCountsResult')({
@@ -15,8 +17,8 @@ export class RsvpCountsResult extends Schema.Class<RsvpCountsResult>('RsvpCounts
 export class EventEmbedInfo extends Schema.Class<EventEmbedInfo>('EventEmbedInfo')({
   title: Schema.String,
   description: Schema.OptionFromNullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
   location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
 }) {}
@@ -25,13 +27,13 @@ export class ChannelEventEntry extends Schema.Class<ChannelEventEntry>('ChannelE
   event_id: Schema.String,
   team_id: Schema.String,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
   status: Schema.String,
-  discord_message_id: Schema.String,
+  discord_message_id: Snowflake,
 }) {}
 
 export class RsvpMemberNotFound extends Schema.TaggedError<RsvpMemberNotFound>()(
@@ -49,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',
   {},
@@ -69,11 +76,33 @@ export class CreateEventResult extends Schema.Class<CreateEventResult>('CreateEv
   title: Schema.String,
 }) {}
 
+export class GuildEventListEntry extends Schema.Class<GuildEventListEntry>('GuildEventListEntry')({
+  event_id: Schema.String,
+  title: Schema.String,
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
+  event_type: Schema.String,
+  yes_count: Schema.Number,
+  no_count: Schema.Number,
+  maybe_count: Schema.Number,
+}) {}
+
+export class GuildEventListResult extends Schema.Class<GuildEventListResult>(
+  'GuildEventListResult',
+)({
+  events: Schema.Array(GuildEventListEntry),
+  total: Schema.Number,
+  team_id: Schema.String,
+}) {}
+
+export class GuildNotFound extends Schema.TaggedError<GuildNotFound>()('GuildNotFound', {}) {}
+
 export class RsvpAttendeeEntry extends Schema.Class<RsvpAttendeeEntry>('RsvpAttendeeEntry')({
-  discord_id: Schema.NullOr(Schema.String),
-  name: Schema.NullOr(Schema.String),
+  discord_id: Schema.OptionFromNullOr(Snowflake),
+  name: Schema.OptionFromNullOr(Schema.String),
   response: Schema.Literal('yes', 'no', 'maybe'),
-  message: Schema.NullOr(Schema.String),
+  message: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class RsvpAttendeesResult extends Schema.Class<RsvpAttendeesResult>('RsvpAttendeesResult')({
@@ -84,9 +113,9 @@ export class RsvpAttendeesResult extends Schema.Class<RsvpAttendeesResult>('Rsvp
 export class NonResponderRpcEntry extends Schema.Class<NonResponderRpcEntry>(
   'NonResponderRpcEntry',
 )({
-  discord_id: Schema.NullOr(Schema.String),
-  name: Schema.NullOr(Schema.String),
-  username: Schema.NullOr(Schema.String),
+  discord_id: Schema.OptionFromNullOr(Snowflake),
+  name: Schema.OptionFromNullOr(Schema.String),
+  username: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class RsvpReminderSummary extends Schema.Class<RsvpReminderSummary>('RsvpReminderSummary')({

package/src/rpc/guild/GuildRpcGroup.ts

@@ -21,7 +21,7 @@ export const GuildRpcGroup = RpcGroup.make(
           channel_id: Discord.Snowflake,
           name: Schema.String,
           type: Schema.Number,
-          parent_id: Schema.NullOr(Discord.Snowflake),
+          parent_id: Schema.OptionFromNullOr(Discord.Snowflake),
         }),
       ),
     },
@@ -33,7 +33,7 @@ export const GuildRpcGroup = RpcGroup.make(
         Schema.Struct({
           discord_id: Schema.String,
           username: Schema.String,
-          avatar: Schema.NullOr(Schema.String),
+          avatar: Schema.OptionFromNullOr(Schema.String),
           roles: Schema.Array(Schema.String),
         }),
       ),
@@ -44,7 +44,7 @@ export const GuildRpcGroup = RpcGroup.make(
       guild_id: Discord.Snowflake,
       discord_id: Schema.String,
       username: Schema.String,
-      avatar: Schema.NullOr(Schema.String),
+      avatar: Schema.OptionFromNullOr(Schema.String),
       roles: Schema.Array(Schema.String),
     },
   }),