add isBacklogQuarter to objective mapper to check for it in the error…

… interceptor
puzzle · Jan 23, 2025 · 38800ad · 38800ad
1 parent ec9970b
commit 38800ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java b/backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java
@@ -3,6 +3,6 @@
 import ch.puzzle.okr.models.State;
 import java.time.LocalDateTime;
 
-public record ObjectiveDto(Long id, int version, String title, Long teamId, Long quarterId, String quarterLabel,
+public record ObjectiveDto(Long id, int version, String title, Long teamId, Long quarterId, String quarterLabel, boolean isBacklogQuarter,
         String description, State state, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean isWriteable) {
 }
diff --git a/backend/src/main/java/ch/puzzle/okr/mapper/ObjectiveMapper.java b/backend/src/main/java/ch/puzzle/okr/mapper/ObjectiveMapper.java
@@ -25,6 +25,7 @@ public ObjectiveDto toDto(Objective objective) {
                                 objective.getTeam().getId(),
                                 objective.getQuarter().getId(),
                                 objective.getQuarter().getLabel(),
+                                objective.getQuarter().isBacklogQuarter(),
                                 objective.getDescription(),
                                 objective.getState(),
                                 objective.getCreatedOn(),

diff --git a/frontend/src/app/interceptors/error.interceptor.spec.ts b/frontend/src/app/interceptors/error.interceptor.spec.ts
@@ -325,7 +325,8 @@ describe('ErrorInterceptor', () => {
       ok: true,
       body: {
         objectiveTitle: 'Das ist der Titel',
-        quarterId: 999
+        quarterId: 999,
+        isBacklogQuarter: true
       }
     };
 

diff --git a/frontend/src/app/interceptors/error.interceptor.ts b/frontend/src/app/interceptors/error.interceptor.ts
@@ -4,8 +4,7 @@ import { catchError, filter, Observable, tap, throwError } from 'rxjs';
 import { Router } from '@angular/router';
 import {
   DRAWER_ROUTES,
-  ERROR_MESSAGE_KEY_PREFIX,
-  MessageEntry, MessageStatusCode,
+  ERROR_MESSAGE_KEY_PREFIX, MessageEntry, MessageStatusCode,
   SUCCESS_MESSAGE_KEY_PREFIX,
   SUCCESS_MESSAGE_MAP
 } from '../shared/constant-library';
@@ -56,8 +55,8 @@ export class ErrorInterceptor implements HttpInterceptor {
     }
 
     let messageKey = successMessageObj.key;
-    const isBacklogQuarter = response.body?.quarter?.isBacklogQuarter;
-    console.log('hallo' + isBacklogQuarter);
+    console.log(response.body);
+    const isBacklogQuarter = response.body?.isBacklogQuarter;
     if (messageKey == 'OBJECTIVE.POST' && isBacklogQuarter) {
       messageKey += '_BACKLOG';
     }

diff --git a/frontend/src/app/shared/constant-library.ts b/frontend/src/app/shared/constant-library.ts
@@ -32,6 +32,8 @@ export const DATE_FORMAT = 'dd.MM.yyyy';
 export const DRAWER_ROUTES = ['objective',
   'keyresult'];
 
+export const GJ_REGEX_PATTERN = /^GJ \d{2}\/\d{2}-Q\d$/;
+
 export const SUCCESS_MESSAGE_MAP: MessageKeyMap = {
   teams: {
     KEY: 'TEAM',