Aligment POC Lias

backend/src/main/java/ch/puzzle/okr/Constants.java

@@ -7,11 +7,14 @@ private Constants() {
     public static final String KEY_RESULT_TYPE_METRIC = "metric";
     public static final String KEY_RESULT_TYPE_ORDINAL = "ordinal";
     public static final String OBJECTIVE = "Objective";
+    public static final String OBJECTIVE_LOWERCASE = "objective";
     public static final String STATE_DRAFT = "Draft";
     public static final String KEY_RESULT = "KeyResult";
     public static final String CHECK_IN = "Check-in";
     public static final String ACTION = "Action";
     public static final String ALIGNMENT = "Alignment";
+    public static final String ALIGNMENT_VIEW = "AlignmentView";
+    public static final String ALIGNED_OBJECTIVE_ID = "alignedObjectiveId";
     public static final String COMPLETED = "Completed";
     public static final String ORGANISATION = "Organisation";
     public static final String QUARTER = "Quarter";

backend/src/main/java/ch/puzzle/okr/ErrorKey.java

@@ -4,5 +4,5 @@ public enum ErrorKey {
     ATTRIBUTE_NULL, ATTRIBUTE_CHANGED, ATTRIBUTE_SET_FORBIDDEN, ATTRIBUTE_NOT_SET, ATTRIBUTE_CANNOT_CHANGE,
     ATTRIBUTE_MUST_BE_DRAFT, KEY_RESULT_CONVERSION, ALREADY_EXISTS_SAME_NAME, CONVERT_TOKEN, DATA_HAS_BEEN_UPDATED,
     MODEL_NULL, MODEL_WITH_ID_NOT_FOUND, NOT_AUTHORIZED_TO_READ, NOT_AUTHORIZED_TO_WRITE, NOT_AUTHORIZED_TO_DELETE,
-    TOKEN_NULL
+    TOKEN_NULL, NOT_LINK_YOURSELF, NOT_LINK_IN_SAME_TEAM, ALIGNMENT_ALREADY_EXISTS, ALIGNMENT_DATA_FAIL
 }

backend/src/main/java/ch/puzzle/okr/SecurityConfig.java

@@ -47,8 +47,9 @@ private HttpSecurity setHeaders(HttpSecurity http) throws Exception {
                         + "script-src 'self' 'unsafe-inline';" + "        style-src 'self' 'unsafe-inline';"
                         + "        object-src 'none';" + "        base-uri 'self';"
                         + "        connect-src 'self' https://sso.puzzle.ch http://localhost:8544;"
-                        + "        font-src 'self';" + "        frame-src 'self';" + "        img-src 'self' data: ;"
-                        + "        manifest-src 'self';" + "        media-src 'self';" + "        worker-src 'none';"))
+                        + "        font-src 'self';" + "        frame-src 'self';"
+                        + "        img-src 'self' data: blob:;" + "        manifest-src 'self';"
+                        + "        media-src 'self';" + "        worker-src 'none';"))
                 .crossOriginEmbedderPolicy(coepCustomizer -> coepCustomizer
                         .policy(CrossOriginEmbedderPolicyHeaderWriter.CrossOriginEmbedderPolicy.REQUIRE_CORP))
                 .crossOriginOpenerPolicy(coopCustomizer -> coopCustomizer

backend/src/main/java/ch/puzzle/okr/controller/AlignmentController.java

@@ -1,8 +1,7 @@
 package ch.puzzle.okr.controller;
 
-import ch.puzzle.okr.dto.alignment.AlignmentObjectiveDto;
-import ch.puzzle.okr.mapper.AlignmentSelectionMapper;
-import ch.puzzle.okr.service.business.AlignmentSelectionBusinessService;
+import ch.puzzle.okr.dto.alignment.AlignmentLists;
+import ch.puzzle.okr.service.business.AlignmentBusinessService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,26 +19,23 @@
 @RestController
 @RequestMapping("api/v2/alignments")
 public class AlignmentController {
-    private final AlignmentSelectionMapper alignmentSelectionMapper;
-    private final AlignmentSelectionBusinessService alignmentSelectionBusinessService;
+    private final AlignmentBusinessService alignmentBusinessService;
 
-    public AlignmentController(AlignmentSelectionMapper alignmentSelectionMapper,
-            AlignmentSelectionBusinessService alignmentSelectionBusinessService) {
-        this.alignmentSelectionMapper = alignmentSelectionMapper;
-        this.alignmentSelectionBusinessService = alignmentSelectionBusinessService;
+    public AlignmentController(AlignmentBusinessService alignmentBusinessService) {
+        this.alignmentBusinessService = alignmentBusinessService;
     }
 
-    @Operation(summary = "Get all objectives and their key results to select the alignment", description = "Get a list of objectives with their key results to select the alignment")
+    @Operation(summary = "Get AlignmentLists from filter", description = "Get a list of AlignmentObjects with all AlignmentConnections, which match current quarter, team and objective filter")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Returned a list of objectives with their key results to select the alignment", content = {
-                    @Content(mediaType = "application/json", schema = @Schema(implementation = AlignmentObjectiveDto.class)) }),
-            @ApiResponse(responseCode = "400", description = "Can't return list of objectives with their key results to select the alignment", content = @Content) })
-    @GetMapping("/selections")
-    public ResponseEntity<List<AlignmentObjectiveDto>> getAlignmentSelections(
-            @RequestParam(required = false, defaultValue = "", name = "quarter") Long quarterFilter,
-            @RequestParam(required = false, defaultValue = "", name = "team") Long teamFilter) {
+            @ApiResponse(responseCode = "200", description = "Returned AlignmentLists, which match current filters", content = {
+                    @Content(mediaType = "application/json", schema = @Schema(implementation = AlignmentLists.class)) }),
+            @ApiResponse(responseCode = "400", description = "Can't generate AlignmentLists from current filters", content = @Content) })
+    @GetMapping("/alignmentLists")
+    public ResponseEntity<AlignmentLists> getAlignments(
+            @RequestParam(required = false, defaultValue = "", name = "teamFilter") List<Long> teamFilter,
+            @RequestParam(required = false, defaultValue = "", name = "quarterFilter") Long quarterFilter,
+            @RequestParam(required = false, defaultValue = "", name = "objectiveQuery") String objectiveQuery) {
         return ResponseEntity.status(HttpStatus.OK)
-                .body(alignmentSelectionMapper.toDto(alignmentSelectionBusinessService
-                        .getAlignmentSelectionByQuarterIdAndTeamIdNot(quarterFilter, teamFilter)));
+                .body(alignmentBusinessService.getAlignmentListsByFilters(quarterFilter, teamFilter, objectiveQuery));
     }
 }

backend/src/main/java/ch/puzzle/okr/controller/ObjectiveController.java

@@ -1,5 +1,6 @@
 package ch.puzzle.okr.controller;
 
+import ch.puzzle.okr.dto.AlignmentDto;
 import ch.puzzle.okr.dto.ObjectiveDto;
 import ch.puzzle.okr.mapper.ObjectiveMapper;
 import ch.puzzle.okr.models.Objective;
@@ -14,6 +15,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 import static org.springframework.http.HttpStatus.IM_USED;
 import static org.springframework.http.HttpStatus.OK;
 
@@ -42,6 +45,19 @@ public ResponseEntity<ObjectiveDto> getObjective(
                 .body(objectiveMapper.toDto(objectiveAuthorizationService.getEntityById(id)));
     }
 
+    @Operation(summary = "Get Alignment possibilities", description = "Get all possibilities to create an Alignment")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Returned all Alignment possibilities for an Objective", content = {
+                    @Content(mediaType = "application/json", schema = @Schema(implementation = AlignmentDto.class)) }),
+            @ApiResponse(responseCode = "401", description = "Not authorized to get Alignment possibilities", content = @Content),
+            @ApiResponse(responseCode = "404", description = "Did not find any possibilities to create an Alignment", content = @Content) })
+    @GetMapping("/alignmentPossibilities/{quarterId}")
+    public ResponseEntity<List<AlignmentDto>> getAlignmentPossibilities(
+            @Parameter(description = "The Quarter ID for getting Alignment possibilities.", required = true) @PathVariable Long quarterId) {
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(objectiveAuthorizationService.getAlignmentPossibilities(quarterId));
+    }
+
     @Operation(summary = "Delete Objective by ID", description = "Delete Objective by ID")
     @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Deleted Objective by ID"),
             @ApiResponse(responseCode = "401", description = "Not authorized to delete an Objective", content = @Content),

backend/src/main/java/ch/puzzle/okr/dto/AlignmentDto.java

@@ -0,0 +1,6 @@
+package ch.puzzle.okr.dto;
+
+import java.util.List;
+
+public record AlignmentDto(Long teamId, String teamName, List<AlignmentObjectDto> alignmentObjects) {
+}

backend/src/main/java/ch/puzzle/okr/dto/AlignmentObjectDto.java

@@ -0,0 +1,4 @@
+package ch.puzzle.okr.dto;
+
+public record AlignmentObjectDto(Long objectId, String objectTitle, String objectType) {
+}

backend/src/main/java/ch/puzzle/okr/dto/ObjectiveDto.java

@@ -1,9 +1,11 @@
 package ch.puzzle.okr.dto;
 
+import ch.puzzle.okr.dto.alignment.AlignedEntityDto;
 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,
-        String description, State state, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean writeable) {
+        String description, State state, LocalDateTime createdOn, LocalDateTime modifiedOn, boolean writeable,
+        AlignedEntityDto alignedEntity) {
 }

backend/src/main/java/ch/puzzle/okr/dto/alignment/AlignedEntityDto.java

@@ -0,0 +1,4 @@
+package ch.puzzle.okr.dto.alignment;
+
+public record AlignedEntityDto(Long id, String type) {
+}

backend/src/main/java/ch/puzzle/okr/dto/alignment/AlignmentConnectionDto.java

@@ -0,0 +1,5 @@
+
+package ch.puzzle.okr.dto.alignment;
+
+public record AlignmentConnectionDto(Long alignedObjectiveId, Long targetObjectiveId, Long targetKeyResultId) {
+}

backend/src/main/java/ch/puzzle/okr/dto/alignment/AlignmentLists.java

@@ -0,0 +1,7 @@
+package ch.puzzle.okr.dto.alignment;
+
+import java.util.List;
+
+public record AlignmentLists(List<AlignmentObjectDto> alignmentObjectDtoList,
+        List<AlignmentConnectionDto> alignmentConnectionDtoList) {
+}

backend/src/main/java/ch/puzzle/okr/dto/alignment/AlignmentObjectDto.java

@@ -0,0 +1,5 @@
+package ch.puzzle.okr.dto.alignment;
+
+public record AlignmentObjectDto(Long objectId, String objectTitle, String objectTeamName, String objectState,
+        String objectType) {
+}

backend/src/main/java/ch/puzzle/okr/mapper/ObjectiveMapper.java

@@ -19,18 +19,21 @@ public ObjectiveMapper(TeamBusinessService teamBusinessService, QuarterBusinessS
         this.quarterBusinessService = quarterBusinessService;
     }
 
+    // TODO: Adjust Unit Tests of ObjectiveMapper after merge of multitenancy-main
+
     public ObjectiveDto toDto(Objective objective) {
         return new ObjectiveDto(objective.getId(), objective.getVersion(), objective.getTitle(),
                 objective.getTeam().getId(), objective.getQuarter().getId(), objective.getQuarter().getLabel(),
                 objective.getDescription(), objective.getState(), objective.getCreatedOn(), objective.getModifiedOn(),
-                objective.isWriteable());
+                objective.isWriteable(), objective.getAlignedEntity());
     }
 
     public Objective toObjective(ObjectiveDto objectiveDto) {
         return Objective.Builder.builder().withId(objectiveDto.id()).withVersion(objectiveDto.version())
                 .withTitle(objectiveDto.title()).withTeam(teamBusinessService.getTeamById(objectiveDto.teamId()))
                 .withDescription(objectiveDto.description()).withModifiedOn(LocalDateTime.now())
                 .withState(objectiveDto.state()).withCreatedOn(objectiveDto.createdOn())
-                .withQuarter(quarterBusinessService.getQuarterById(objectiveDto.quarterId())).build();
+                .withQuarter(quarterBusinessService.getQuarterById(objectiveDto.quarterId()))
+                .withAlignedEntity(objectiveDto.alignedEntity()).build();
     }
 }

backend/src/main/java/ch/puzzle/okr/models/Objective.java

@@ -1,5 +1,6 @@
 package ch.puzzle.okr.models;
 
+import ch.puzzle.okr.dto.alignment.AlignedEntityDto;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -52,6 +53,7 @@ public class Objective implements WriteableInterface {
     private User modifiedBy;
 
     private transient boolean writeable;
+    private transient AlignedEntityDto alignedEntity;
 
     public Objective() {
     }
@@ -68,6 +70,7 @@ private Objective(Builder builder) {
         setState(builder.state);
         setCreatedOn(builder.createdOn);
         setModifiedBy(builder.modifiedBy);
+        setAlignedEntity(builder.alignedEntity);
     }
 
     public Long getId() {
@@ -160,12 +163,20 @@ public void setWriteable(boolean writeable) {
         this.writeable = writeable;
     }
 
+    public AlignedEntityDto getAlignedEntity() {
+        return alignedEntity;
+    }
+
+    public void setAlignedEntity(AlignedEntityDto alignedEntity) {
+        this.alignedEntity = alignedEntity;
+    }
+
     @Override
     public String toString() {
         return "Objective{" + "id=" + id + ", version=" + version + ", title='" + title + '\'' + ", createdBy="
                 + createdBy + ", team=" + team + ", quarter=" + quarter + ", description='" + description + '\''
                 + ", modifiedOn=" + modifiedOn + ", state=" + state + ", createdOn=" + createdOn + ", modifiedBy="
-                + modifiedBy + ", writeable=" + writeable + '\'' + '}';
+                + modifiedBy + ", writeable=" + writeable + ", alignedEntity=" + alignedEntity + '\'' + '}';
     }
 
     @Override
@@ -201,6 +212,7 @@ public static final class Builder {
         private State state;
         private LocalDateTime createdOn;
         private User modifiedBy;
+        private AlignedEntityDto alignedEntity;
 
         private Builder() {
         }
@@ -264,6 +276,11 @@ public Builder withModifiedBy(User modifiedBy) {
             return this;
         }
 
+        public Builder withAlignedEntity(AlignedEntityDto alignedEntity) {
+            this.alignedEntity = alignedEntity;
+            return this;
+        }
+
         public Objective build() {
             return new Objective(this);
         }

backend/src/main/java/ch/puzzle/okr/models/alignment/Alignment.java

@@ -34,6 +34,10 @@ public Long getId() {
         return id;
     }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public int getVersion() {
         return version;
     }