Merge pull request #23 from Singularity-Game/development

Development

Author: Rotti2

apps/singularity-api/project.json

@@ -59,7 +59,8 @@
     "serve": {
       "executor": "@nx/js:node",
       "options": {
-        "buildTarget": "singularity-api:build"
+        "buildTarget": "singularity-api:build",
+        "runtimeArgs": ["--watch"]
       }
     },
     "lint": {

apps/singularity-api/src/app/app.module.ts

@@ -11,6 +11,7 @@ import { classes } from '@automapper/classes';
 import { UserManagementModule } from './user-management/user-management.module';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { PartyModule } from './party/party.module';
+import { ScheduleModule } from '@nestjs/schedule';
 
 @Module({
   imports: [
@@ -50,6 +51,7 @@ import { PartyModule } from './party/party.module';
     AutomapperModule.forRoot({
       strategyInitializer: classes()
     }),
+    ScheduleModule.forRoot(),
     SongModule,
     UserManagementModule,
     PartyModule

apps/singularity-api/src/app/party/automapper-profiles/party-participant.profile.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
+import { createMap, forMember, mapFrom, Mapper, MappingProfile } from '@automapper/core';
+import { PartyParticipantDto } from '@singularity/api-interfaces';
+import { PartyParticipant } from '../models/party-participant';
+
+@Injectable()
+export class PartyParticipantProfile extends AutomapperProfile {
+  constructor(@InjectMapper() mapper: Mapper) {
+    super(mapper);
+  }
+
+  get profile(): MappingProfile {
+    return (mapper) => {
+      createMap(mapper, PartyParticipant, PartyParticipantDto, forMember(dest => dest.id, mapFrom(src => src.id)));
+      createMap(mapper, PartyParticipantDto, PartyParticipant, forMember(dest => dest.id, mapFrom(src => src.id)));
+    };
+  }
+}

apps/singularity-api/src/app/party/automapper-profiles/party-queue-item.profile.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
+import { createMap, forMember, mapFrom, Mapper, MappingProfile } from '@automapper/core';
+import { PartyQueueItem } from '../models/party-queue-item';
+import { PartyParticipantDto, PartyQueueItemDto } from '@singularity/api-interfaces';
+import { PartyParticipant } from '../models/party-participant';
+
+@Injectable()
+export class PartyQueueItemProfile extends AutomapperProfile {
+  constructor(@InjectMapper() mapper: Mapper) {
+    super(mapper);
+  }
+
+  get profile(): MappingProfile {
+    return (mapper) => {
+      createMap(mapper, PartyQueueItem, PartyQueueItemDto,
+        forMember(dest => dest.participants, mapFrom(src => mapper.mapArray(src.participants, PartyParticipant, PartyParticipantDto))),
+        forMember(dest => dest.id, mapFrom(src => src.id)));
+      createMap(mapper, PartyQueueItemDto, PartyQueueItem,
+        forMember(dest => dest.participants, mapFrom(src => mapper.mapArray(src.participants, PartyParticipantDto, PartyParticipant))),
+        forMember(dest => dest.id, mapFrom(src => src.id)));
+    };
+  }
+}

apps/singularity-api/src/app/party/automapper-profiles/party.profile.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
+import { createMap, forMember, ignore, mapFrom, Mapper, MappingProfile } from '@automapper/core';
+import { Party } from '../models/party';
+import { PartyDto } from '@singularity/api-interfaces';
+
+@Injectable()
+export class PartyProfile extends AutomapperProfile {
+  constructor(@InjectMapper() mapper: Mapper) {
+    super(mapper);
+  }
+
+  get profile(): MappingProfile {
+    return (mapper) => {
+      createMap(mapper, Party, PartyDto, forMember(dest => dest.id, mapFrom(src => src.id)), forMember(dest => dest.creator, mapFrom(src => src.creator.username)));
+      createMap(mapper, PartyDto, Party, forMember(dest => dest.id, mapFrom(src => src.id)), forMember(dest => dest.creator, ignore()));
+    };
+  }
+}

apps/singularity-api/src/app/party/models/party-participant.ts

@@ -1,9 +1,25 @@
 import { UUID } from '@singularity/api-interfaces';
+import { AutoMap } from '@automapper/classes';
 
 export class PartyParticipant {
+  @AutoMap()
   public readonly id: UUID;
+
+  @AutoMap()
   public readonly name: string;
+
+  @AutoMap()
   public readonly pictureBase64: string;
-  public totalPoints: number;
-  public totalPlays: number;
+
+  @AutoMap()
+  public totalPoints = 0;
+
+  @AutoMap()
+  public totalPlays = 0;
+
+  constructor(name: string, pictureBase64: string) {
+    this.id = crypto.randomUUID();
+    this.name = name;
+    this.pictureBase64 = pictureBase64;
+  }
 }

apps/singularity-api/src/app/party/models/party-queue-item.ts

@@ -1,7 +1,26 @@
 import { PartyParticipant } from './party-participant';
 import { Song } from '../../song/models/song.entity';
+import { UUID } from '@singularity/api-interfaces';
+import { AutoMap } from '@automapper/classes';
 
 export class PartyQueueItem {
+  @AutoMap()
+  public readonly id: UUID;
+
+  @AutoMap()
+  public readonly song: Song;
+
+  @AutoMap()
   public participants: PartyParticipant[];
-  public song: Song;
+
+  constructor(song: Song, participants: PartyParticipant[]) {
+    this.id = crypto.randomUUID();
+    this.song = song;
+    this.participants = participants;
+  }
+
+  @AutoMap()
+  public get ready(): boolean {
+    return this.participants.length > 1;
+  }
 }

apps/singularity-api/src/app/party/models/party.ts

@@ -1,19 +1,142 @@
 import { User } from '../../user-management/models/user.entity';
-import { UUID } from '@singularity/api-interfaces';
+import { AutoMap } from '@automapper/classes';
+import { Song } from '../../song/models/song.entity';
+import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs';
 import { PartyParticipant } from './party-participant';
+import { PartyQueueItem } from './party-queue-item';
+import { UUID } from '@singularity/api-interfaces';
 
 export class Party {
-  public readonly id: UUID;
+  @AutoMap()
+  public readonly id: string;
+
+  @AutoMap()
   public readonly name: string;
+
+  @AutoMap()
   public readonly creator: User;
-  public participants: PartyParticipant[];
-  public lastInteraction: Date;
+
+  private lastInteraction: Date;
+  private participants: PartyParticipant[] = [];
+
+  private currentSongSubject = new ReplaySubject<Song>(1);
+  private queueSubject = new BehaviorSubject<PartyQueueItem[]>([])
 
   constructor(name: string, user: User) {
-    this.id = crypto.randomUUID();
+    this.id = Math.random().toString(36).slice(2, 7);
     this.lastInteraction = new Date();
-    this.participants = [];
     this.name = name;
     this.creator = user;
   }
+
+  public join(participant: PartyParticipant): void {
+    this.lastInteraction = new Date();
+
+    this.participants.push(participant);
+  }
+
+  public getParticipantById(participantId: string): PartyParticipant {
+    this.lastInteraction = new Date();
+
+    return this.participants.find((participant: PartyParticipant) => participant.id === participantId);
+  }
+
+  public setCurrentSong(song: Song): void {
+    this.lastInteraction = new Date();
+
+    this.currentSongSubject.next(song);
+  }
+
+  public queueSong(queueItem: PartyQueueItem): void {
+    this.lastInteraction = new Date();
+
+    const queue = this.queueSubject.getValue();
+    queue.push(queueItem);
+    this.queueSubject.next(queue);
+  }
+
+  public popSong(queueItemId: string): void {
+    this.lastInteraction = new Date();
+
+    const queue = this.queueSubject.getValue();
+    const index = queue.findIndex((queueItem) => queueItem.id === queueItemId);
+
+    if(index === -1) {
+      throw new Error('There is no queueItem with the given id')
+    }
+
+    queue.splice(index, 1);
+    this.queueSubject.next(queue);
+  }
+
+  public joinQueuedSong(queueId: UUID, participant: PartyParticipant): PartyQueueItem {
+    this.lastInteraction = new Date();
+
+    const queue = this.queueSubject.getValue();
+    const queueItem = queue.find((item: PartyQueueItem) => item.id === queueId);
+
+    if(!queueItem) {
+      throw Error('There is no QueueItem with the given Id');
+    }
+
+    if(queueItem.participants.length >= 2) {
+      throw Error('Max Participants for this QueueItem reached');
+    }
+
+    queueItem.participants.push(participant);
+
+    // Move Item to the back of the queue when it is ready.
+    if (queueItem.participants.length === 2) {
+      queue.splice(queue.indexOf(queueItem), 1);
+      queue.push(queueItem);
+    }
+
+    this.queueSubject.next(queue);
+
+    return queueItem;
+  }
+
+  public leaveQueuedSong(queueId: UUID, participant: PartyParticipant): PartyQueueItem {
+    this.lastInteraction = new Date();
+
+    const queue = this.queueSubject.getValue();
+    const queueItem = queue.find((item: PartyQueueItem) => item.id === queueId);
+
+    if(!queueItem) {
+      throw Error('There is no QueueItem with the given Id');
+    }
+
+    const index = queueItem.participants.findIndex((queueParticipant: PartyParticipant) => queueParticipant.id === participant.id);
+
+    if(index === -1) {
+      throw Error('The given Participant is not a Participant of this queueItem');
+    }
+
+    queueItem.participants.splice(index, 1);
+
+    // Remove the queueItem if there are no participants left
+    if(queueItem.participants.length === 0) {
+      queue.splice(queue.indexOf(queueItem));
+    }
+
+    this.queueSubject.next(queue);
+
+    return queueItem;
+  }
+
+  public getCurrentSong$(): Observable<Song> {
+    this.lastInteraction = new Date();
+
+    return this.currentSongSubject.asObservable();
+  }
+
+  public getQueue$(): Observable<PartyQueueItem[]> {
+    this.lastInteraction = new Date();
+
+    return this.queueSubject.asObservable();
+  }
+
+  public getLastInteraction(): Date {
+    return this.lastInteraction;
+  }
 }