Feature/profile add about me

.eslintrc.json

@@ -102,7 +102,6 @@
  "@angular-eslint/template/attributes-order": "warn",
  "@angular-eslint/template/banana-in-box": "error",
  "@angular-eslint/template/conditional-complexity": "error",
- "@angular-eslint/template/cyclomatic-complexity": "error",
  "@angular-eslint/template/no-interpolation-in-attributes": "error",
  "@angular-eslint/template/no-negated-async": "error",
  "@angular-eslint/template/no-positive-tabindex": "error",

src/app/app.config.ts

@@ -22,7 +22,7 @@ import { AppInstanceIdInterceptor } from '@shared/util/logging/app-instance-id.i
 import { defaultStoreProvider } from '@state-adapt/angular';
 import { DancierBackendMockedService } from '@shared/data-access/dancier-backend-mocked.service';
 import { UnauthorizedInterceptor } from '@shared/util/auth/unauthorized.interceptor';
-import { AuthWithCredentialsInterceptor } from '@shared/util/auth/auth-with-credentials.interceptor';
+import { WithCredentialsInterceptor } from '@shared/util/auth/with-credentials-interceptor.service';
 
 const httpInterceptorProviders = [
  {
@@ -32,7 +32,7 @@ const httpInterceptorProviders = [
  },
  {
  provide: HTTP_INTERCEPTORS,
- useClass: AuthWithCredentialsInterceptor,
+ useClass: WithCredentialsInterceptor,
  multi: true,
  },
  {

src/app/chat/data-access/chat-http.service.ts

@@ -18,7 +18,7 @@ import {
  MessageResponse,
  MessageResponseWithChatId,
 } from './chat.types';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 
 @Injectable({
  providedIn: 'root',
@@ -30,7 +30,7 @@ export class ChatHttpService {
  private readonly chatApiUrl: string;
  private readonly dancerApiUrl: string;
 
- private profileService = inject(ProfileService);
+ private profileService = inject(ProfileOldService);
 
  constructor(
  private http: HttpClient,
@@ -66,7 +66,7 @@ export class ChatHttpService {
  this.http
  // .get<ChatList>('/chats', this.defaultOptions)
  .get<ChatList>(this.chatApiUrl, this.defaultOptions)
- .pipe(map((chatList) => chatList.chats))
+ .pipe(map((chatList) => chatList.chats || []))
  );
  }
 

src/app/chat/data-access/chat-state.adapter.ts

@@ -9,27 +9,25 @@ import {
 import { HttpErrorResponse } from '@angular/common/http';
 
 export const chatStateAdapter = createAdapter<ChatAdaptState>()({
- chatsFetched: (state, chatsDto: ChatDto[]) => ({
- ...state,
- chatsFetchState: 'loaded',
- chatCreated: false,
- chats: [
- // only add new chats (chat id not in state yet)
- ...state.chats,
- ...chatsDto
- .filter(
- (chatDto) =>
- !state.chats.find((stateChat) => stateChat.id === chatDto.chatId)
- )
- .map((chatDto) => ({
- id: chatDto.chatId,
- participants: chatDto.dancerIds.map((dancerId) => ({
- id: dancerId,
- })),
- messages: [],
- })),
- ],
- }),
+ chatsFetched: (state, chatsDto: ChatDto[]) => {
+ const newChats = chatsDto
+ .filter(
+ (chatDto) =>
+ !state.chats.find((stateChat) => stateChat.id === chatDto.chatId)
+ )
+ .map((chatDto) => ({
+ id: chatDto.chatId,
+ participants: chatDto.dancerIds.map((dancerId) => ({ id: dancerId })),
+ messages: [],
+ }));
+
+ return {
+ ...state,
+ chatsFetchState: 'loaded',
+ chatCreated: false,
+ chats: [...state.chats, ...newChats],
+ };
+ },
 
  chatsFetchedError: (state, chatsFetchError: HttpErrorResponse) => ({
  ...state,

src/app/chat/ui/chat-conversation-header.component.ts

@@ -9,7 +9,7 @@ import { CommonModule } from '@angular/common';
 import { ChatStateService } from '../data-access/chat-state.service';
 import { ChatParticipant } from '../data-access/chat.types';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { startWith } from 'rxjs/operators';
 import { Profile } from '../../profile/data-access/types/profile.types';
 import { map } from 'rxjs';
@@ -37,7 +37,7 @@ export class ChatConversationHeaderComponent {
  private chatState = inject(ChatStateService);
 
  ownProfileId: Signal<string | undefined> = toSignal(
- inject(ProfileService).profile$.pipe(
+ inject(ProfileOldService).profile$.pipe(
  startWith({
  id: 'dancerId1',
  } as Profile),

src/app/chat/ui/chat-messages/chat-messages.component.ts

@@ -9,7 +9,7 @@ import { AsyncPipe, JsonPipe, NgClass, NgFor, NgIf } from '@angular/common';
 import { ChatMessage } from '../../data-access/chat.types';
 import { ChatStateService } from '../../data-access/chat-state.service';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { startWith } from 'rxjs/operators';
 import { Profile } from '../../../profile/data-access/types/profile.types';
 import { map } from 'rxjs';
@@ -50,7 +50,7 @@ import { map } from 'rxjs';
 export class ChatMessagesComponent {
  chatState = inject(ChatStateService);
  ownUserId: Signal<string | undefined> = toSignal(
- inject(ProfileService).profile$.pipe(
+ inject(ProfileOldService).profile$.pipe(
  startWith({
  id: 'dancerId1',
  } as Profile),

src/app/chat/ui/conversation-list/chat-conversation-list-entry.component.ts

@@ -13,7 +13,7 @@ import {
 } from '../../data-access/chat-state.service';
 import { ImageService } from '@shared/data-access/image.service';
 import { ChatParticipant } from '../../data-access/chat.types';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { map } from 'rxjs';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { startWith } from 'rxjs/operators';
@@ -62,7 +62,7 @@ import { Profile } from '../../../profile/data-access/types/profile.types';
 export class ChatConversationListEntryComponent {
  chatState = inject(ChatStateService);
  ownProfileId: Signal<string | undefined> = toSignal(
- inject(ProfileService).profile$.pipe(
+ inject(ProfileOldService).profile$.pipe(
  startWith({
  id: 'dancerId1',
  } as Profile),
@@ -115,7 +115,7 @@ export class ChatConversationListEntryComponent {
  // constructor(
  // public imageService: ImageService,
  // public chatStore: ChatStore,
- // public profileService: ProfileService,
+ // public profileService: ProfileOldService,
  // public router: Router
  // ) {
  // this.profileService.profile$.subscribe((profile) => {

src/app/chat/ui/old/chat.service.ts

@@ -11,7 +11,7 @@
 // } from '../../common/types/chat.types';
 // import { combineLatest, map, Observable, shareReplay, switchMap } from 'rxjs';
 // import { Router } from '@angular/router';
-// import { ProfileService } from '@shared/profile/profile.service';
+// import { ProfileOldService } from '@shared/profile/profile.service';
 //
 // type FetchChatsDto = {
 // chats: ChatDto[];
@@ -47,7 +47,7 @@
 // private http: HttpClient,
 // private environment: EnvironmentService,
 // private authStorageService: AuthStorageService,
-// private profileService: ProfileService,
+// private profileService: ProfileOldService,
 // private router: Router
 // ) {
 // this.chatApiUrl = `${this.environment.getApiUrl()}/chats`;

src/app/chat/ui/old/chat.store.ts

@@ -16,7 +16,7 @@
 // withLatestFrom,
 // } from 'rxjs';
 // import { ChatService } from './chat.service';
-// import { ProfileService } from '@shared/profile/profile.service';
+// import { ProfileOldService } from '@shared/profile/profile.service';
 // import { EnvironmentService } from '@shared/common/environment.service';
 //
 // export type ChatState = {
@@ -47,7 +47,7 @@
 // {
 // constructor(
 // private chatService: ChatService,
-// private profileService: ProfileService,
+// private profileService: ProfileOldService,
 // private environmentService: EnvironmentService // @Inject(IntervalSchedulerToken) private scheduler: SchedulerLike
 // ) {
 // super(defaultState);

src/app/profile/data-access/profile.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class ProfileService {
+ constructor() {}
+
+ // public getOwnProfile(): void {}
+ //
+ // public getProfile(dancerId: string): void {}
+}

src/app/profile/data-access/types/profile.types.ts

@@ -50,6 +50,7 @@ export type Dance = {
 };
 
 export type PersonalData = {
+ aboutMe: string;
  size: number;
  gender: Gender;
  birthDate: string;
@@ -60,7 +61,6 @@ export type PersonalData = {
 
 export type Profile = PersonalData & {
  id?: string;
- aboutMe: string;
  dancerName: string;
  ableTo: Dance[];
  wantsTo: Dance[];

src/app/profile/feature/edit-profile/edit-profile.component.html

@@ -13,6 +13,7 @@ <h2 class="my-4 text-2xl">Profilbild</h2>
  ? croppedImage
  : (profileService.getProfileImageSrc() | async)
  "
+ (error)="handleMissingImage($event)"
  />
  </div>
 

src/app/profile/feature/edit-profile/edit-profile.component.ts

@@ -5,7 +5,7 @@ import {
  ReactiveFormsModule,
 } from '@angular/forms';
 import { APIError, APIResponse } from '@shared/util/http/response.types';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import {
  Profile,
  UploadedImageDao,
@@ -23,6 +23,7 @@ import { DanceExperienceFormComponent } from '../../ui/dance-experience-form/dan
 import { PersonalDataFormComponent } from '../../ui/personal-data-form/personal-data-form.component';
 import { AsyncPipe, NgIf } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
+import { ImageService } from '@shared/data-access/image.service';
 
 type EditProfileForm = {
  personalData: FormGroup<Partial<PersonalDataForm>>;
@@ -60,8 +61,9 @@ export class EditProfileComponent {
 
  constructor(
  private fb: NonNullableFormBuilder,
- public profileService: ProfileService,
+ public profileService: ProfileOldService,
  private imageUploadService: ImageUploadService,
+ private imageService: ImageService,
  private router: Router
  ) {}
 
@@ -88,6 +90,7 @@ export class EditProfileComponent {
  if (this.profileForm.valid) {
  const formValues = this.profileForm.getRawValue();
  const profile: Partial<Profile> = {
+ aboutMe: formValues.personalData!.aboutMe!,
  size: formValues.personalData!.size!,
  birthDate: format(formValues.personalData!.birthDate!, 'yyyy-MM-dd', {
  locale: de,
@@ -123,4 +126,9 @@ export class EditProfileComponent {
  this.profileForm.markAllAsTouched();
  }
  }
+
+ handleMissingImage($event: ErrorEvent): void {
+ ($event.target as HTMLImageElement).src =
+ this.imageService.getDefaultDancerImage();
+ }
 }

src/app/profile/feature/initial-setup/init-dance-experience/init-dance-experience.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { DanceExperienceForm } from '../../../ui/dance-experience-form/dance-form.type';
 import { Dance } from '../../../data-access/types/profile.types';
@@ -30,7 +30,10 @@ export class InitDanceExperienceComponent {
 
  apiError?: APIError;
 
- constructor(public profileService: ProfileService, private router: Router) {}
+ constructor(
+ public profileService: ProfileOldService,
+ private router: Router
+ ) {}
 
  submitForm(): void {
  if (this.form.valid && this.form.value.dances) {

src/app/profile/feature/initial-setup/init-partner-dance-experience/init-partner-dance-experience.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { DanceExperienceForm } from '../../../ui/dance-experience-form/dance-form.type';
 import { Dance } from '../../../data-access/types/profile.types';
@@ -30,7 +30,10 @@ export class InitPartnerDanceExperienceComponent {
 
  apiError?: APIError;
 
- constructor(public profileService: ProfileService, private router: Router) {}
+ constructor(
+ public profileService: ProfileOldService,
+ private router: Router
+ ) {}
 
  submitForm(): void {
  if (this.form.valid && this.form.value.dances) {

src/app/profile/feature/initial-setup/init-personal-data/init-personal-data.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { PersonalData } from '../../../data-access/types/profile.types';
 import { UntilDestroy } from '@ngneat/until-destroy';
 import { APIError } from '@shared/util/http/response.types';
@@ -34,7 +34,10 @@ export class InitPersonalDataComponent {
 
  error?: APIError;
 
- constructor(public profileService: ProfileService, private router: Router) {}
+ constructor(
+ public profileService: ProfileOldService,
+ private router: Router
+ ) {}
 
  submitForm(): void {
  if (this.personalDataForm.valid) {

src/app/profile/feature/initial-setup/init-profile-image/init-profile-image.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ImageUploadService } from '../../../data-access/image-upload.service';
 import { ImageCroppedEvent, ImageCropperModule } from 'ngx-image-cropper';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import { APIResponse } from '@shared/util/http/response.types';
 import { UploadedImageDao } from '../../../data-access/types/profile.types';
 import { Router } from '@angular/router';
@@ -22,7 +22,7 @@ export class InitProfileImageComponent {
 
  constructor(
  private imageUploadService: ImageUploadService,
- private profileService: ProfileService,
+ private profileService: ProfileOldService,
  private router: Router
  ) {}
 

src/app/profile/feature/initial-setup/init-user-name/init-user-name.component.spec.ts

@@ -62,7 +62,11 @@ describe('Setting up username', () => {
  }),
  },
  MockProvider(AuthStorageService, {
- authData$: of({ isLoggedIn: true, isHuman: true }),
+ authData$: of({
+ isLoggedIn: true,
+ isHuman: true,
+ jwt: 'token',
+ }),
  }),
  ],
  stubsEnabled: false,

src/app/profile/feature/initial-setup/init-user-name/init-user-name.component.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ProfileHttpService } from '@shared/data-access/profile/profile-http.service';
-import { ProfileService } from '@shared/data-access/profile/profile.service';
+import { ProfileOldService } from '@shared/data-access/profile/profile-old.service';
 import {
  APIError,
  APIResponse,
@@ -44,7 +44,7 @@ export class InitUserNameComponent {
  error?: APIError;
 
  constructor(
- public profileService: ProfileService,
+ public profileService: ProfileOldService,
  private profileHttpService: ProfileHttpService,
  private fb: NonNullableFormBuilder,
  private router: Router