Changes in / [7e7cc4c:74ad056]

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/core/state/question-facade.service.ts (modified) (2 diffs)
• app/core/state/question-state/question-state-request.models.ts (modified) (1 diff)
• app/core/state/question-state/question.actions.ts (modified) (3 diffs)
• app/core/state/question-state/question.effects.ts (modified) (3 diffs)
• app/core/state/question-state/question.mapper.ts (modified) (3 diffs)
• app/core/state/question-state/question.reducers.ts (modified) (1 diff)
• app/shared-app/components/components.ts (modified) (2 diffs)
• app/shared-app/components/question/answer-question/answer-question.component.html (added)
• app/shared-app/components/question/answer-question/answer-question.component.scss (added)
• app/shared-app/components/question/answer-question/answer-question.component.spec.ts (added)
• app/shared-app/components/question/answer-question/answer-question.component.ts (added)
• app/shared-app/components/question/preview-question-full/preview-question-full.component.html (modified) (1 diff)
• app/shared-app/components/question/preview-question-full/preview-question-full.component.ts (modified) (1 diff)
• app/shared-app/components/question/question-preview/question-preview.component.html (modified) (1 diff)
• assets/translations/en.json (modified) (1 diff)

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

@@ -14 +14 @@
 import { AuthService } from '../services';
 import {
+  AnswerQuestion,
   EffectStartedWorking,
   GetPreviewQuestionsLatest,
@@ -99 +100 @@
   }
 
+  public answerQuestion(questionUid: string, text: string): void {
+    this.dispatchEffect(new AnswerQuestion(questionUid, text));
+  }
+
   private fetchPreviewQuestionsLatest(): void {
     this.dispatchEffect(new GetPreviewQuestionsLatest());

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

@@ -8 +8 @@
   constructor(public text: string) {}
 }
+
+export class AnswerQuestionRequest {
+  constructor(public text: string) {}
+}

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

@@ -3 +3 @@
 
 import {
+  AnswerQuestionStateViewModel,
   AnswerResponseQuestionStateViewModel,
   PreviewQuestionViewModel,
@@ -26 +27 @@
   VoteAnswer = '[Question] Vote answer',
   VoteAnswerSuccess = '[Question] Vote answer Success',
+  AnswerQuestion = '[Question] AnswerQuestion',
+  AnswerQuestionSuccess = '[Question] AnswerQuestion Success',
   EffectStartedWorking = '[Question] Effect Started Working',
   EffectFinishedWorking = '[Question] Effect Finished Working',
   EffectFinishedWorkingError = '[Question] Effect Finished Working error'
+}
+
+export class AnswerQuestion implements Action {
+  readonly type = QuestionActionTypes.AnswerQuestion;
+
+  constructor(public questionUid: string, public text: string) {}
+}
+
+export class AnswerQuestionSuccess implements Action {
+  readonly type = QuestionActionTypes.AnswerQuestionSuccess;
+
+  constructor(public payload: AnswerQuestionStateViewModel) {}
 }
 
@@ -141 +156 @@
   | SetCorrectAnswerSuccess
   | RespondToAnswerSuccess
+  | AnswerQuestionSuccess
   | EffectStartedWorking
   | EffectFinishedWorking

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

@@ -8 +8 @@
 import { NotificationService } from '../../services/notification.service';
 import { QuestionFacadeService } from '../question-facade.service';
-import { RespondToAnswerRequest, VoteAnswerRequest } from './question-state-request.models';
+import { AnswerQuestionRequest, RespondToAnswerRequest, VoteAnswerRequest } from './question-state-request.models';
 import {
+  AnswerQuestionStateResponse,
   AnswerResponseQuestionStateResponse,
   PreviewQuestionResponse,
@@ -16 +17 @@
 } from './question-state-response.models';
 import {
+  AnswerQuestion,
+  AnswerQuestionSuccess,
   EffectFinishedWorking,
   EffectFinishedWorkingError,
@@ -165 +168 @@
     );
   });
+
+  answerQuestion$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType<AnswerQuestion>(QuestionActionTypes.AnswerQuestion),
+      mergeMap((action) => {
+        return this.api
+          .post<AnswerQuestionStateResponse>(`v1/questions/${action.questionUid}/answers`, new AnswerQuestionRequest(action.text))
+          .pipe(
+            tap((state) => this.notification.successNotification('success-answer')),
+            switchMap((state) => [
+              new AnswerQuestionSuccess(QuestionMapper.ToAnswerQuestionStateViewModel(state)),
+              new EffectFinishedWorking()
+            ]),
+            catchError((err) => [new EffectFinishedWorkingError(err)])
+          );
+      })
+    );
+  });
 }

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

@@ -15 +15 @@
 import { TranslateFromJsonService } from 'src/app/shared-app/services';
 import {
+  AnswerQuestionStateResponse,
   AnswerResponseQuestionStateResponse,
   PreviewQuestionResponse,
@@ -29 +30 @@
 
     if (questionStateResponse.answersResponse.length > 0) {
-      answers = questionStateResponse.answersResponse.map((x) => {
-        let answerResponses: AnswerResponseQuestionStateViewModel[] = [];
-
-        if (x.answerResponsesResponse.length > 0) {
-          answerResponses = x.answerResponsesResponse.map((y) => {
-            const answerResponseStudent = new AnswerResponseStudentQuestionStateViewModel(
-              y.studentResponse.uid,
-              y.studentResponse.index,
-              y.studentResponse.imageUrl,
-              y.studentResponse.reputation
-            );
-
-            return new AnswerResponseQuestionStateViewModel(y.uid, y.text, moment(y.createdOn), answerResponseStudent);
-          });
-        }
-
-        const answerStudent = new AnswerStudentQuestionStateViewModel(
-          x.studentResponse.uid,
-          x.studentResponse.index,
-          x.studentResponse.imageUrl,
-          x.studentResponse.reputation
-        );
-
-        return new AnswerQuestionStateViewModel(
-          x.uid,
-          x.text,
-          x.correctAnswer,
-          moment(x.createdOn),
-          x.votesCount,
-          answerStudent,
-          answerResponses
-        );
-      });
+      answers = questionStateResponse.answersResponse.map((x) => QuestionMapper.ToAnswerQuestionStateViewModel(x));
     }
 
@@ -136 +105 @@
     return new AnswerResponseQuestionStateViewModel(response.uid, response.text, moment(response.createdOn), answerResponseStudent);
   }
+
+  public static ToAnswerQuestionStateViewModel(response: AnswerQuestionStateResponse): AnswerQuestionStateViewModel {
+    let answerResponses: AnswerResponseQuestionStateViewModel[] = [];
+
+    if (response.answerResponsesResponse.length > 0) {
+      answerResponses = response.answerResponsesResponse.map((y) => {
+        const answerResponseStudent = new AnswerResponseStudentQuestionStateViewModel(
+          y.studentResponse.uid,
+          y.studentResponse.index,
+          y.studentResponse.imageUrl,
+          y.studentResponse.reputation
+        );
+
+        return new AnswerResponseQuestionStateViewModel(y.uid, y.text, moment(y.createdOn), answerResponseStudent);
+      });
+    }
+
+    const answerStudent = new AnswerStudentQuestionStateViewModel(
+      response.studentResponse.uid,
+      response.studentResponse.index,
+      response.studentResponse.imageUrl,
+      response.studentResponse.reputation
+    );
+
+    return new AnswerQuestionStateViewModel(
+      response.uid,
+      response.text,
+      response.correctAnswer,
+      moment(response.createdOn),
+      response.votesCount,
+      answerStudent,
+      answerResponses
+    );
+  }
 }

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

@@ -114 +114 @@
       };
     }
+    case QuestionActionTypes.AnswerQuestionSuccess: {
+      if (state.question) {
+        return {
+          ...state,
+          question: {
+            ...state.question,
+            answers: [...state.question.answers, action.payload]
+          }
+        };
+      }
+
+      return {
+        ...state
+      };
+    }
     case QuestionActionTypes.EffectStartedWorking: {
       return {

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

@@ -5 +5 @@
 import { TextEditorComponent } from './generic/text-editor/text-editor.component';
 import { VoteComponent } from './generic/vote/vote.component';
+import { AnswerQuestionComponent } from './question/answer-question/answer-question.component';
 import { AskQuestionSharedComponent } from './question/ask-question-shared/ask-question-shared.component';
 import { PreviewQuestionDisplayComponent } from './question/preview-question-display/preview-question-display.component';
@@ -26 +27 @@
   PreviewQuestionFullComponent,
   TextEditorComponent,
-  RespondToAnswerDialogComponent
+  RespondToAnswerDialogComponent,
+  AnswerQuestionComponent
 ];

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

@@ -40 +40 @@
   </mat-card-content>
   <mat-card-actions>
+    <app-button (action)="scrollToBottom()" [buttonType]="ButtonType.CallToAction">{{
+      'preview-question-full-answer' | translate
+    }}</app-button>
     <app-button appShareLink [buttonType]="ButtonType.Basic">{{ 'share-link' | translate }}</app-button>
   </mat-card-actions>

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

@@ -14 +14 @@
 
   ngOnInit(): void {}
+
+  scrollToBottom(): void {
+    window.scrollTo(0, document.body.scrollHeight);
+  }
 }

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

@@ -59 +59 @@
     </mat-card>
   </ng-container>
+  <app-answer-question></app-answer-question>
 </div>

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

@@ -63 +63 @@
   "submit-button": "Submit",
   "header-student-questions": "Your questions",
+  "success-answer": "Successfully answered question",
+  "preview-question-full-answer": "Answer question",
+  "answer-question-title": "Give your answer to the question",
+  "answer-question-button": "Answer",
+  "StudentDoesNotOwnQuestion": "You do not own this question",
   "AnswerAlreadyUpvoted": "You have already upvoted this answer",
   "AnswerAlreadyDownvoted": "You have already downvoted this answer",