Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.roleimpact.catalog.persistence;

import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HexFormat;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -57,15 +61,35 @@ public List<IdEdge> findWorkflowStepConstraints(UUID organizationId) {
}

public String findContentHash(UUID organizationId, int version) {
return jdbcClient.sql("""
var savedHash = jdbcClient.sql("""
SELECT content_hash
FROM organization_versions
WHERE organization_id = :organizationId AND version = :version
""")
.param("organizationId", organizationId)
.param("version", version)
.query(String.class)
.single();
.optional();
if (savedHash.isPresent()) return savedHash.get();
if (version != 0) {
throw new IllegalStateException("Organization version " + version + " has no content hash");
}
String draftFingerprint = jdbcClient.sql("""
SELECT id::text || '|' || updated_at::text
FROM organizations
WHERE id = :organizationId AND workspace_status = 'DRAFT'
""").param("organizationId", organizationId).query(String.class).single();
return sha256(draftFingerprint);
}

private String sha256(String value) {
try {
return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
.digest(value.getBytes(StandardCharsets.UTF_8)));
}
catch (NoSuchAlgorithmException exception) {
throw new IllegalStateException("SHA-256 is unavailable", exception);
}
}

private List<IdEdge> queryEdges(String sql, UUID organizationId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public class EmployeeEntity {
@Column(name = "team_id", nullable = false)
private UUID teamId;

@Column(name = "employee_no", nullable = false, unique = true, length = 40)
@Column(name = "employee_no", unique = true, length = 40)
private String employeeNumber;

@Column(nullable = false, length = 160)
private String name;

@Column(nullable = false, unique = true, length = 254)
@Column(unique = true, length = 254)
private String email;

@Enumerated(EnumType.STRING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
import com.roleimpact.workspace.application.WorkspaceConflictException;
import com.roleimpact.workspace.application.WorkspaceNotFoundException;
import com.roleimpact.workspace.application.WorkspaceValidationException;
import com.roleimpact.workspace.editor.application.DraftCatalogConflictException;
import com.roleimpact.workspace.editor.application.DraftCatalogNotFoundException;
import com.roleimpact.workspace.editor.application.PublishedWorkspaceMutationException;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -26,7 +29,7 @@ public class ApiExceptionHandler {

@ExceptionHandler({OrganizationNotFoundException.class, ImpactEntityNotFoundException.class,
RecommendationNotFoundException.class, SimulationNotFoundException.class,
WorkspaceNotFoundException.class})
WorkspaceNotFoundException.class, DraftCatalogNotFoundException.class})
ResponseEntity<ErrorEnvelope> handleNotFound(RuntimeException exception) {
return error(HttpStatus.NOT_FOUND, "ENTITY_NOT_FOUND", exception.getMessage(), List.of());
}
Expand All @@ -51,6 +54,11 @@ ResponseEntity<ErrorEnvelope> handleWorkspaceConflict(WorkspaceConflictException
return error(HttpStatus.CONFLICT, "WORKSPACE_CONFLICT", exception.getMessage(), List.of());
}

@ExceptionHandler({DraftCatalogConflictException.class, PublishedWorkspaceMutationException.class})
ResponseEntity<ErrorEnvelope> handleDraftCatalogConflict(RuntimeException exception) {
return error(HttpStatus.CONFLICT, "DRAFT_CATALOG_CONFLICT", exception.getMessage(), List.of());
}

@ExceptionHandler(MethodArgumentNotValidException.class)
ResponseEntity<ErrorEnvelope> handleValidation(MethodArgumentNotValidException exception) {
var fieldErrors = exception.getBindingResult().getFieldErrors().stream()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
package com.roleimpact.workspace.editor.api;

import java.util.UUID;

import com.roleimpact.workspace.editor.application.DraftCatalogService;

import jakarta.validation.Valid;

import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/v1/workspaces/{workspaceId}/catalog")
public class DraftCatalogController {

private final DraftCatalogService service;

public DraftCatalogController(DraftCatalogService service) {
this.service = service;
}

@GetMapping
public DraftCatalogResource get(@PathVariable UUID workspaceId) {
return service.get(workspaceId);
}

@PostMapping("/teams")
public DraftCatalogResource createTeam(
@PathVariable UUID workspaceId,
@Valid @RequestBody TeamRequest request) {
return service.createTeam(workspaceId, request);
}

@PutMapping("/teams/{teamId}")
public DraftCatalogResource updateTeam(@PathVariable UUID workspaceId, @PathVariable UUID teamId,
@Valid @RequestBody TeamRequest request) {
return service.updateTeam(workspaceId, teamId, request);
}

@DeleteMapping("/teams/{teamId}")
public DraftCatalogResource deleteTeam(@PathVariable UUID workspaceId, @PathVariable UUID teamId) {
return service.deleteTeam(workspaceId, teamId);
}

@PostMapping("/members")
public DraftCatalogResource createMember(
@PathVariable UUID workspaceId,
@Valid @RequestBody MemberRequest request) {
return service.createMember(workspaceId, request);
}

@PutMapping("/members/{memberId}")
public DraftCatalogResource updateMember(@PathVariable UUID workspaceId, @PathVariable UUID memberId,
@Valid @RequestBody MemberRequest request) {
return service.updateMember(workspaceId, memberId, request);
}

@DeleteMapping("/members/{memberId}")
public DraftCatalogResource deleteMember(@PathVariable UUID workspaceId, @PathVariable UUID memberId) {
return service.deleteMember(workspaceId, memberId);
}

@PostMapping("/roles")
public DraftCatalogResource createRole(
@PathVariable UUID workspaceId,
@Valid @RequestBody RoleRequest request) {
return service.createRole(workspaceId, request);
}

@PutMapping("/roles/{roleId}")
public DraftCatalogResource updateRole(@PathVariable UUID workspaceId, @PathVariable UUID roleId,
@Valid @RequestBody RoleRequest request) {
return service.updateRole(workspaceId, roleId, request);
}

@DeleteMapping("/roles/{roleId}")
public DraftCatalogResource deleteRole(@PathVariable UUID workspaceId, @PathVariable UUID roleId) {
return service.deleteRole(workspaceId, roleId);
}

@PutMapping("/members/{memberId}/roles")
public DraftCatalogResource replaceMemberRoles(
@PathVariable UUID workspaceId,
@PathVariable UUID memberId,
@Valid @RequestBody RoleAssignmentRequest request) {
return service.replaceMemberRoles(workspaceId, memberId, request);
}

@PostMapping("/workflows/quick")
public DraftCatalogResource createQuickWorkflow(
@PathVariable UUID workspaceId,
@Valid @RequestBody QuickWorkflowRequest request) {
return service.createQuickWorkflow(workspaceId, request);
}

@PostMapping("/workflows/{workflowId}/requirements")
public DraftCatalogResource addWorkflowRequirement(
@PathVariable UUID workspaceId,
@PathVariable UUID workflowId,
@Valid @RequestBody WorkflowRequirementRequest request) {
return service.addWorkflowRequirement(workspaceId, workflowId, request);
}

@DeleteMapping("/workflows/{workflowId}")
public DraftCatalogResource deleteWorkflow(
@PathVariable UUID workspaceId,
@PathVariable UUID workflowId) {
return service.deleteWorkflow(workspaceId, workflowId);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package com.roleimpact.workspace.editor.api;

import java.util.List;
import java.util.Set;
import java.util.UUID;

public record DraftCatalogResource(
UUID workspaceId,
List<TeamItem> teams,
List<MemberItem> members,
List<RoleItem> roles,
List<WorkflowItem> workflows) {

public DraftCatalogResource {
teams = List.copyOf(teams);
members = List.copyOf(members);
roles = List.copyOf(roles);
workflows = List.copyOf(workflows);
}

public record TeamItem(UUID id, String name, String department, int memberCount) {
}

public record MemberItem(
UUID id,
UUID teamId,
String employeeNumber,
String name,
String email,
String status,
String region,
String shift,
Set<UUID> roleIds) {
public MemberItem {
roleIds = Set.copyOf(roleIds);
}
}

public record RoleItem(
UUID id,
String name,
String description,
String sensitivity,
UUID ownerMemberId,
int memberCount) {
}

public record WorkflowItem(
UUID id,
String name,
String criticality,
List<WorkflowRequirementItem> requirements,
boolean quickManaged) {
public WorkflowItem {
requirements = List.copyOf(requirements);
}
}

public record WorkflowRequirementItem(
UUID id,
String name,
int position,
int minimumActors,
int resilienceTarget,
String requiredDepartment,
String requiredRegion,
String requiredShift,
Set<UUID> roleIds) {
public WorkflowRequirementItem {
roleIds = Set.copyOf(roleIds);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.roleimpact.workspace.editor.api;

import java.util.UUID;

import com.roleimpact.shared.model.EmployeeStatus;
import com.roleimpact.shared.model.Region;
import com.roleimpact.shared.model.WorkShift;

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;

public record MemberRequest(
@NotNull UUID teamId,
@Size(max = 40) String employeeNumber,
@NotBlank @Size(max = 160) String name,
@Email @Size(max = 254) String email,
@NotNull EmployeeStatus status,
@NotNull Region region,
@NotNull WorkShift shift) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.roleimpact.workspace.editor.api;

import java.util.UUID;

import com.roleimpact.shared.model.WorkflowCriticality;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

public record QuickWorkflowRequest(
@NotBlank @Size(max = 160) String name,
@NotNull WorkflowCriticality criticality,
@NotBlank @Size(max = 160) String requirementName,
@NotNull UUID roleId,
@Min(1) int minimumActors,
@Min(1) int resilienceTarget) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.roleimpact.workspace.editor.api;

import java.util.Set;
import java.util.UUID;

import jakarta.validation.constraints.NotNull;

public record RoleAssignmentRequest(@NotNull Set<UUID> roleIds) {

public RoleAssignmentRequest {
roleIds = roleIds == null ? null : Set.copyOf(roleIds);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.roleimpact.workspace.editor.api;

import java.util.UUID;

import com.roleimpact.shared.model.Sensitivity;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

public record RoleRequest(
@NotBlank @Size(max = 120) String name,
@NotBlank @Size(max = 2000) String description,
@NotNull Sensitivity sensitivity,
UUID ownerMemberId) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.roleimpact.workspace.editor.api;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;

public record TeamRequest(
@NotBlank @Size(max = 120) String name,
@NotBlank @Size(max = 120) String department) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.roleimpact.workspace.editor.api;

import java.util.UUID;

import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

public record WorkflowRequirementRequest(
@NotBlank @Size(max = 160) String name,
@NotNull UUID roleId,
@Min(1) int minimumActors,
@Min(1) int resilienceTarget) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.roleimpact.workspace.editor.application;

public class DraftCatalogConflictException extends RuntimeException {

public DraftCatalogConflictException(String message) {
super(message);
}
}
Loading
Loading