benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

activated typescript strict mode

Browse Source
This commit is contained in:
smuddyx
2021-05-22 15:30:04 +02:00
parent a195fafa6b
commit cb2c028ca4
76 changed files with 511 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/modules/shows/services/show.service.ts
View File

@@ -10,30 +10,51 @@ import {User} from '../../../services/user/user';
providedIn: 'root',
})
export class ShowService {
public static SHOW_TYPE = ['service-worship', 'service-praise', 'home-group-big', 'home-group', 'prayer-group', 'teens-group', 'kids-group', 'misc-public', 'misc-private'];
public static SHOW_TYPE_PUBLIC = ['service-worship', 'service-praise', 'home-group-big', 'teens-group', 'kids-group', 'misc-public'];
public static SHOW_TYPE = [
'service-worship',
'service-praise',
'home-group-big',
'home-group',
'prayer-group',
'teens-group',
'kids-group',
'misc-public',
'misc-private',
];
public static SHOW_TYPE_PUBLIC = [
'service-worship',
'service-praise',
'home-group-big',
'teens-group',
'kids-group',
'misc-public',
];
public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private'];
private user: User;
private user: User | null = null;
public constructor(private showDataService: ShowDataService, private userService: UserService) {
userService.user$.subscribe(_ => (this.user = _));
}
public read$ = (showId: string): Observable<Show> => this.showDataService.read$(showId);
public read$ = (showId: string): Observable<Show | null> => this.showDataService.read$(showId);
public list$(publishedOnly = false): Observable<Show[]> {
return this.userService.user$.pipe(
switchMap(
() => this.showDataService.list$(),
(user: User, shows: Show[]) => ({user, shows})
(user: User | null, shows: Show[]) => ({user, shows})
),
map(s => s.shows.filter(_ => !_.archived).filter(show => show.published || (show.owner === s.user.id && !publishedOnly)))
map(s =>
s.shows.filter(_ => !_.archived).filter(show => show.published || (show.owner === s.user?.id && !publishedOnly))
)
);
}
public update$ = async (showId: string, data: Partial<Show>): Promise<void> => this.showDataService.update(showId, data);
public update$ = async (showId: string, data: Partial<Show>): Promise<void> =>
this.showDataService.update(showId, data);
public async new$(data: Partial<Show>): Promise<string> {
public async new$(data: Partial<Show>): Promise<string | null> {
if (!data.showType || !this.user) return null;
const calculatedData: Partial<Show> = {
...data,
owner: this.user.id,