Changeset b9d7ae5 for src/Clients

Timestamp:

11/03/21 16:43:08 (3 years ago)

Author:

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

Branches:

dev

Children:

6901f8b, 91bfcf4

Parents:

80e2fe0 (diff), 2a9d9d1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged feature/set-correct-answer into dev

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/core/services/auth.service.ts (modified) (3 diffs)
• app/core/state/question-facade.service.ts (modified) (5 diffs)
• app/core/state/question-state/question.actions.ts (modified) (3 diffs)
• app/core/state/question-state/question.effects.ts (modified) (5 diffs)
• app/core/state/question-state/question.reducers.ts (modified) (2 diffs)
• app/shared-app/components/generic/vote/vote.component.html (modified) (2 diffs)
• app/shared-app/components/generic/vote/vote.component.scss (modified) (1 diff)
• app/shared-app/components/generic/vote/vote.component.ts (modified) (1 diff)
• app/shared-app/components/question/question-preview/question-preview.component.html (modified) (1 diff)
• app/shared-app/components/question/question-preview/question-preview.component.ts (modified) (2 diffs)
• app/shared-app/models/user.models.ts (modified) (2 diffs)
• app/shared-app/services/base-api.service.ts (modified) (1 diff)
• assets/translations/en.json (modified) (1 diff)

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

@@ -24 +24 @@
   public user: ApplicationUser | null = null;
   public oidcUser: User | null = null;
+  public selfUser: SelfUserResponse | null = null;
 
   constructor(private baseApi: BaseApiService) {
@@ -35 +36 @@
         user?.profile.isVerified
       );
+
+      this.selfUserDto().subscribe((selfUser) => {
+        if (selfUser) {
+          this.selfUser = selfUser;
+        }
+      });
     });
   }
@@ -86 +93 @@
         user.profile.isVerified
       );
+
+      if (!this.selfUser) {
+        this.selfUserDto().subscribe((selfUser) => {
+          if (selfUser) {
+            this.selfUser = selfUser;
+          }
+        });
+      }
     });
   }

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

@@ -3 +3 @@
 import { Action, Store } from '@ngrx/store';
 import { Observable, Subject } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 import {
@@ -12 +12 @@
   VoteType
 } from 'src/app/shared-app/models';
+import { AuthService } from '../services';
 import {
   EffectStartedWorking,
@@ -18 +19 @@
   GetQuestionState,
   GetSearchQuestions,
+  SetCorrectAnswer,
   VoteAnswer
 } from './question-state/question.actions';
@@ -31 +33 @@
   effectWorking$: Observable<boolean | HttpErrorResponse>;
 
-  constructor(private store: Store<QuestionState>) {
+  constructor(private store: Store<QuestionState>, private auth: AuthService) {
     this.effectWorking$ = this.store.select(questionStateQuery.effectWorking).pipe(filter((effect) => effect !== null));
+  }
+
+  public currentQuestionOwnedByCurrentUser(): Observable<boolean> {
+    return this.getQuestion().pipe(map((question) => this.auth.selfUser?.student?.uid === question.student.uid));
   }
 
@@ -71 +77 @@
   }
 
+  public setCorrectAnswer(questionUid: string, answerUid: string): void {
+    this.dispatchEffect(new SetCorrectAnswer(questionUid, answerUid));
+  }
+
   public voteAnswer(answerUid: string, questionUid: string, voteType: VoteType): void {
     this.dispatchEffect(new VoteAnswer(questionUid, answerUid, voteType));

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

@@ -13 +13 @@
   GetQuestionState = '[Question] Get state',
   GetQuestionStateSuccess = '[Question] Get state success',
+  SetCorrectAnswer = '[Question] Set Correct Answer',
+  SetCorrectAnswerSuccess = '[Question] Set Correct Answer success',
   GetPreviewQuestionsLatest = '[Question] Get preview questions Latest',
   GetPreviewQuestionsLatestSuccess = '[Question] Get preview questions Latest Success',
@@ -36 +38 @@
 
   constructor(public payload: QuestionStateViewModel) {}
+}
+
+export class SetCorrectAnswer implements Action {
+  readonly type = QuestionActionTypes.SetCorrectAnswer;
+
+  constructor(public questionUid: string, public answerUid: string) {}
+}
+
+export class SetCorrectAnswerSuccess implements Action {
+  readonly type = QuestionActionTypes.SetCorrectAnswerSuccess;
+
+  constructor(public payload: string) {}
 }
 
@@ -110 +124 @@
   | GetSearchQuestionsSuccess
   | VoteAnswerSuccess
+  | SetCorrectAnswerSuccess
   | EffectStartedWorking
   | EffectFinishedWorking

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

@@ -1 +1 @@
 import { Injectable } from '@angular/core';
 import { act, Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 import { PreviewQuestionsOrderEnum, SearchQuestionsQueryViewModel } from 'src/app/shared-app/models';
 import { TranslateFromJsonService } from 'src/app/shared-app/services';
 
 import { BaseApiService } from 'src/app/shared-app/services/base-api.service';
+import { NotificationService } from '../../services/notification.service';
 import { QuestionFacadeService } from '../question-facade.service';
 import { VoteAnswerRequest } from './question-state-request.models';
@@ -21 +22 @@
   GetSearchQuestionsSuccess,
   QuestionActionTypes,
+  SetCorrectAnswer,
+  SetCorrectAnswerSuccess,
   VoteAnswer,
   VoteAnswerSuccess
@@ -34 +37 @@
     private api: BaseApiService,
     private translate: TranslateFromJsonService,
-    private facade: QuestionFacadeService
+    private facade: QuestionFacadeService,
+    private notification: NotificationService
   ) {}
 
@@ -113 +117 @@
         const body = new VoteAnswerRequest(action.voteType);
         return this.api.post<VoteAnswerResponse>(`v1/questions/${action.questionUid}/answers/${action.answerUid}/votes`, body).pipe(
+          tap((state) => this.notification.successNotification('sucess-vote')),
           switchMap((state) => [new VoteAnswerSuccess(QuestionMapper.ToVoteAnswerViewModel(state)), new EffectFinishedWorking()]),
           catchError((err) => [new EffectFinishedWorkingError(err)])
@@ -119 +124 @@
     );
   });
+
+  setCorrectAnswer$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType<SetCorrectAnswer>(QuestionActionTypes.SetCorrectAnswer),
+      mergeMap((action) => {
+        return this.api.put<string>(`v1/questions/${action.questionUid}/answers/${action.answerUid}/correct`).pipe(
+          tap((state) => this.notification.successNotification('success-correct-answer')),
+          switchMap((state) => [new SetCorrectAnswerSuccess(state), new EffectFinishedWorking()]),
+          catchError((err) => [new EffectFinishedWorkingError(err)])
+        );
+      })
+    );
+  });
 }

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

@@ -1 @@
-import { VoteType } from 'src/app/shared-app/models';
+import { AnswerQuestionStateViewModel, VoteType } from 'src/app/shared-app/models';
 import { QuestionAction, QuestionActionTypes } from './question.actions';
 import { initialState, QuestionState } from './question.state';
@@ -61 +61 @@
       };
     }
+    case QuestionActionTypes.SetCorrectAnswerSuccess: {
+      if (state.question) {
+        return {
+          ...state,
+          question: {
+            ...state.question,
+            answers: state.question.answers.map((x) => {
+              if (x.correctAnswer) {
+                return {
+                  ...x,
+                  correctAnswer: false
+                };
+              }
+              if (x.uid === action.payload) {
+                return {
+                  ...x,
+                  correctAnswer: true
+                };
+              }
+              return x;
+            })
+          }
+        };
+      }
+
+      return {
+        ...state
+      };
+    }
     case QuestionActionTypes.EffectStartedWorking: {
       return {

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/vote/vote.component.html

@@ -1 @@
-<div>
+<div class="main-div">
   <div class="vote-icons" fxLayout="column" fxLayoutAlign="center center">
     <mat-icon class="vote-icon" (click)="voted(VoteType.Upvote)" [inline]="true">arrow_drop_up</mat-icon>
@@ -7 +7 @@
       >check</mat-icon
     >
+    <mat-icon
+      *ngIf="canSetCorrectAnswer && !correct"
+      [inline]="true"
+      class="text-center text-bold green set-correct-answer"
+      (click)="setCorrectAnswer.emit()"
+      >check</mat-icon
+    >
   </div>
 </div>

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/vote/vote.component.scss

@@ -14 +14 @@
   cursor: pointer;
 }
+
+.show-on-hover {
+  display: none;
+}
+
+.set-correct-answer {
+  opacity: 0.3;
+  visibility: hidden;
+}
+
+.main-div:hover > .vote-icons > .set-correct-answer {
+  visibility: visible;
+}
+
+.main-div {
+  height: 100%;
+}

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/vote/vote.component.ts

@@ -10 +10 @@
 export class VoteComponent implements OnInit {
   @Input() voteCount: number | undefined;
+  @Input() canSetCorrectAnswer: boolean | null = false;
   @Input() correct = false;
   @Output() voteClicked = new EventEmitter<VoteType>();
+  @Output() setCorrectAnswer = new EventEmitter<void>();
 
   VoteType = VoteType;

src/Clients/Angular/finki-chattery/src/app/shared-app/components/question/question-preview/question-preview.component.html

@@ -15 +15 @@
         <div fxLayout="row wrap" fxLayoutAlign="space-around none">
           <app-vote
+            [canSetCorrectAnswer]="canSetCorrectAnswer | async"
             [voteCount]="answer.votesCount"
             [correct]="answer.correctAnswer"
             (voteClicked)="answerVoted($event, answer.uid, question.uid)"
+            (setCorrectAnswer)="setCorrectAnswer(question.uid, answer.uid)"
             fxFlex="6%"
           ></app-vote>

src/Clients/Angular/finki-chattery/src/app/shared-app/components/question/question-preview/question-preview.component.ts

@@ -13 +13 @@
 })
 export class QuestionPreviewComponent implements OnInit {
+  canSetCorrectAnswer = this.questionFacade.currentQuestionOwnedByCurrentUser();
   question!: QuestionStateViewModel;
   working = true;
@@ -34 +35 @@
     this.questionFacade.voteAnswer(answerUid, questionUid, voteType);
   }
+
+  setCorrectAnswer(questionUid: string, answerUid: string): void {
+    this.questionFacade.setCorrectAnswer(questionUid, answerUid);
+  }
 }

src/Clients/Angular/finki-chattery/src/app/shared-app/models/user.models.ts

@@ -9 +9 @@
 }
 
-export class SelfUserResponse {
-  uid!: string;
-}
-
 export enum ApplicationUserType {
   Student = 'Student',
@@ -19 +15 @@
   Guest = 'Guest'
 }
+
+export class SelfUserResponse {
+  public student?: StudentSelfResponse | null;
+  public teacher?: TeacherSelfResponse | null;
+  public moderator?: ModeratorSelfResponse | null;
+}
+
+export class StudentSelfResponse {
+  public uid!: string;
+  public applicationUserId!: number;
+  public index!: string;
+  public reputation!: number;
+  public imageUrl!: string;
+  public questions!: StudentQuestionResponse[];
+  public teams!: StudentTeamResponse[];
+}
+
+export class StudentQuestionResponse {
+  public questionUid!: string;
+  public title!: string;
+}
+
+export class StudentTeamResponse {
+  public teamUid!: string;
+  public name!: string;
+}
+
+export class ModeratorSelfResponse {
+  public uid!: string;
+  public applicationUserId!: number;
+}
+
+export class TeacherSelfResponse {
+  public uid!: string;
+  public applicationUserId!: number;
+  public teams!: TeacherTeamResponse[];
+}
+
+export class TeacherTeamResponse {
+  public teamUid!: string;
+  public name!: string;
+}

src/Clients/Angular/finki-chattery/src/app/shared-app/services/base-api.service.ts

@@ -19 +19 @@
 
   public getSelfUser(): Observable<SelfUserResponse> {
-    return this.get<SelfUserResponse>('self');
+    return this.get<SelfUserResponse>('v1/self');
   }
 

src/Clients/Angular/finki-chattery/src/assets/translations/en.json

@@ -53 +53 @@
   "ask-question-stepper-ask": "Ask question",
   "ask-question-ask-button-back": "Edit question",
+  "sucess-vote": "Successfully voted answer",
+  "success-correct-answer": "Successfully set correct answer",
   "ask-question-ask-button": "Ask question",
   "AnswerAlreadyUpvoted": "You have already upvoted this answer",