better song sorting

src/app/modules/shows/services/show-song.service.ts

@@ -12,14 +12,13 @@ import {UserService} from '../../../services/user/user.service';
 export class ShowSongService {
   public constructor(private showSongDataService: ShowSongDataService, private songDataService: SongDataService, private userService: UserService) {}
 
-  public async new$(showId: string, songId: string, order: number, addedLive = false): Promise<string | null> {
+  public async new$(showId: string, songId: string, addedLive = false): Promise<string | null> {
     const song = await this.songDataService.read$(songId).pipe(take(1)).toPromise();
     const user = await this.userService.user$.pipe(take(1)).toPromise();
     if (!song || !user) return null;
     const data: Partial<ShowSong> = {
       ...song,
       songId,
-      order,
       key: song.key,
       keyOriginal: song.key,
       chordMode: user.chordMode,
@@ -31,7 +30,7 @@ export class ShowSongService {
   public read$ = (showId: string, songId: string): Observable<ShowSong | null> => this.showSongDataService.read$(showId, songId);
   public read = (showId: string, songId: string): Promise<ShowSong | null> => this.read$(showId, songId).pipe(first()).toPromise();
 
-  public list$ = (showId: string): Observable<ShowSong[]> => this.showSongDataService.list$(showId, _ => _.orderBy('order'));
+  public list$ = (showId: string): Observable<ShowSong[]> => this.showSongDataService.list$(showId);
   public list = (showId: string): Promise<ShowSong[]> => this.list$(showId).pipe(first()).toPromise();
   public delete$ = (showId: string, songId: string): Promise<void> => this.showSongDataService.delete(showId, songId);
   public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> => await this.showSongDataService.update$(showId, songId, data);

src/app/modules/shows/services/show-song.ts

@@ -6,7 +6,6 @@ export interface ShowSong extends Song {
   songId: string;
   key: string;
   keyOriginal: string;
-  order: number;
   chordMode: ChordMode;
   addedLive: boolean;
 }

src/app/modules/shows/services/show.service.ts

@@ -38,6 +38,7 @@ export class ShowService {
     const calculatedData: Partial<Show> = {
       ...data,
       owner: this.user.id,
+      order: [],
       public: ShowService.SHOW_TYPE_PUBLIC.indexOf(data.showType) !== -1,
     };
     return await this.showDataService.add(calculatedData);

src/app/modules/shows/services/show.ts

@@ -10,6 +10,7 @@ export interface Show {
   reported: boolean;
   published: boolean;
   archived: boolean;
+  order: string[];
 
   presentationSongId: string;
   presentationSection: number;