Changeset f3c4950 for src/Clients/Angular/finki-chattery/src/app/core

Timestamp:

01/19/22 16:59:58 (2 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

6738cc0

Parents:

fcc3080

Message:

Moderator can create categories

Location:

src/Clients/Angular/finki-chattery/src/app/core

Files:

• guards/authorized-moderator.guard.ts (added)
• services/auth.service.ts (modified) (1 diff)
• services/redirect.service.ts (modified) (1 diff)
• state/category-facade.service.ts (modified) (3 diffs)
• state/category-state/category-state-request.models.ts (added)
• state/category-state/category.actions.ts (modified) (3 diffs)
• state/category-state/category.effects.ts (modified) (2 diffs)
• state/category-state/category.mapper.ts (modified) (1 diff)
• state/category-state/category.reducers.ts (modified) (1 diff)

src/Clients/Angular/finki-chattery/src/app/core/services/auth.service.ts

@@ -64 +64 @@
   }
 
+  public isModerator(): boolean {
+    return this.user !== null && this.user.userType === ApplicationUserType.Moderator;
+  }
+
   public currentUser(): ApplicationUser | null {
     return this.user;

src/Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts

@@ -21 +21 @@
         case ApplicationUserType.Teacher:
           break;
+        case ApplicationUserType.Moderator:
+          this.router.navigateByUrl(`moderating/categories`);
+          break;
       }
     }

src/Clients/Angular/finki-chattery/src/app/core/state/category-facade.service.ts

@@ -6 +6 @@
 
 import { CategoryStateViewModel } from 'src/app/shared-app/models';
-import { EffectStartedWorking, GetCategoriesState } from './category-state/category.actions';
+import { AddCategory, EffectStartedWorking, GetCategoriesState } from './category-state/category.actions';
 import { categoriesStateQuery } from './category-state/category.selectors';
 import { CategoryState } from './category-state/category.state';
@@ -17 +17 @@
 
   constructor(private store: Store<CategoryState>) {
-    this.effectWorking$ = this.store.select(categoriesStateQuery.effectWorking).pipe(
-      filter((effect) => effect !== null),
-      map((effect) => {
-        if (effect instanceof HttpErrorResponse) {
-          throw effect;
-        } else {
-          return effect;
-        }
-      }),
-      catchError((err) => {
-        return throwError(err);
-      })
-    );
+    this.effectWorking$ = this.store.select(categoriesStateQuery.effectWorking).pipe(filter((effect) => effect !== null));
   }
 
@@ -38 +26 @@
   public fetchCategories(): void {
     this.dispatchEffect(new GetCategoriesState());
+  }
+
+  public addNewCategory(name: string): void {
+    this.dispatchEffect(new AddCategory(name));
   }
 

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.actions.ts

@@ -2 +2 @@
 import { Action } from '@ngrx/store';
 import { CategoryStateViewModel } from 'src/app/shared-app/models';
-import { CategoryStateResponse } from './category-state.models';
 
 export enum CategoryActionTypes {
   GetCategoriesState = '[Category] Get state',
   GetCategoriesStateSuccess = '[Category] Get state success',
+  AddCategory = '[Category] AddCategory',
+  AddCategorySuccess = '[Category] AddCategorySuccess success',
   EffectStartedWorking = '[Category] Effect Started Working',
   EffectFinishedWorking = '[Category] Effect Finished Working',
@@ -22 +23 @@
 
   constructor(public payload: CategoryStateViewModel[]) {}
+}
+
+export class AddCategory implements Action {
+  readonly type = CategoryActionTypes.AddCategory;
+
+  constructor(public name: string) {}
+}
+
+export class AddCategorySuccess implements Action {
+  readonly type = CategoryActionTypes.AddCategorySuccess;
+
+  constructor(public payload: CategoryStateViewModel) {}
 }
 
@@ -42 +55 @@
 }
 
-export type CategoryAction = GetCategoriesStateSuccess | EffectStartedWorking | EffectFinishedWorking | EffectFinishedWorkingError;
+export type CategoryAction =
+  | GetCategoriesStateSuccess
+  | AddCategorySuccess
+  | EffectStartedWorking
+  | EffectFinishedWorking
+  | EffectFinishedWorkingError;

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.effects.ts

@@ -1 +1 @@
 import { Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, switchMap } from 'rxjs/operators';
+import { catchError, mergeMap, switchMap } from 'rxjs/operators';
 import { TranslateFromJsonService } from 'src/app/shared-app/services';
 
 import { BaseApiService } from 'src/app/shared-app/services/base-api.service';
+import { CreateCategoryRequest } from './category-state-request.models';
 import { CategoryStateResponse } from './category-state.models';
 import {
+  AddCategory,
+  AddCategorySuccess,
   CategoryActionTypes,
   EffectFinishedWorking,
@@ -35 +38 @@
     );
   });
+
+  addCategory$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType<AddCategory>(CategoryActionTypes.AddCategory),
+      mergeMap((action) => {
+        return this.api.post<string>(`v1/categories`, new CreateCategoryRequest(action.name)).pipe(
+          switchMap((state) => [
+            new AddCategorySuccess(CategoriesMapper.ToCategoryStateViewModel(state, action.name, this.translate)),
+            new EffectFinishedWorking()
+          ]),
+          catchError((err) => [new EffectFinishedWorkingError(err)])
+        );
+      })
+    );
+  });
 }

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.mapper.ts

@@ -10 +10 @@
     return categoriesResponse.map((x) => new CategoryStateViewModel(x.uid, x.name, translate.instant(x.name)));
   }
+
+  public static ToCategoryStateViewModel(uid: string, name: string, translate: TranslateFromJsonService): CategoryStateViewModel {
+    return new CategoryStateViewModel(uid, name, translate.instant(name));
+  }
 }

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.reducers.ts

@@ -9 +9 @@
         categories: action.payload
       };
+    case CategoryActionTypes.AddCategorySuccess: {
+      return {
+        ...state,
+        categories: [action.payload, ...state.categories]
+      };
+    }
     case CategoryActionTypes.EffectStartedWorking: {
       return {