fix: issue with optional types

Author: thielpa

client/src/app/components/deployment-selection/deployment-selection.component.ts

@@ -21,6 +21,7 @@ export class DeploymentSelectionComponent {
   queryClient = inject(QueryClient);
 
   sourceRef = input.required<string>();
+  commitSha = input.required<string>();
 
   private currentEnvironmentId: number | null = null;
 
@@ -40,6 +41,6 @@ export class DeploymentSelectionComponent {
 
   handleDeploy = (environment: EnvironmentDto) => {
     this.currentEnvironmentId = environment.id;
-    this.deployEnvironment.mutate({ body: { environmentId: environment.id, branchName: this.sourceRef() } });
+    this.deployEnvironment.mutate({ body: { environmentId: environment.id, branchName: this.sourceRef(), commitSha: this.commitSha() } });
   };
 }

client/src/app/components/release-candidate-deployment-table/release-candidate-deployment-table.component.ts

@@ -61,7 +61,7 @@ export class ReleaseCandidateDeploymentTableComponent {
       {
         body: {
           environmentId: environment.id,
-          branchName: this.releaseCandidate().branch.name,
+          branchName: this.releaseCandidate().branch?.name,
           commitSha: this.releaseCandidate().commit.sha,
         },
       },

client/src/app/core/modules/openapi/schemas.gen.ts

@@ -381,7 +381,7 @@ export const DeployRequestSchema = {
       type: 'string',
     },
   },
-  required: ['branchName', 'environmentId'],
+  required: ['commitSha', 'environmentId'],
 } as const;
 
 export const WorkflowRunDtoSchema = {

client/src/app/core/modules/openapi/types.gen.ts

@@ -122,8 +122,8 @@ export type ReleaseInfoListDto = {
 
 export type DeployRequest = {
   environmentId: number;
-  branchName: string;
-  commitSha?: string;
+  branchName?: string;
+  commitSha: string;
 };
 
 export type WorkflowRunDto = {

client/src/app/pages/branch-details/branch-details.component.html

@@ -31,7 +31,7 @@ <h2 class="text-2xl" [innerHTML]="commit()?.message | markdown"></h2>
 <div class="flex flex-col gap-6 max-w-6xl mr-4">
   <app-pipeline [selector]="pipelineSelector()" />
   @if (query.data(); as branch) {
-    <app-deployment-selection [sourceRef]="branch.name" />
+    <app-deployment-selection [sourceRef]="branch.name" [commitSha]="branch.commitSha" />
   }
 </div>
 

client/src/app/pages/pull-request-details/pull-request-details.component.html

@@ -46,7 +46,7 @@ <h2 class="text-2xl">
   <app-pipeline [selector]="pipelineSelector()" />
   @if (query.data(); as pr) {
     @if (pr.headRefRepoNameWithOwner === pr.repository?.nameWithOwner) {
-      <app-deployment-selection [sourceRef]="pr.headRefName" />
+      <app-deployment-selection [sourceRef]="pr.headRefName" [commitSha]="pr.headSha" />
     }
   }
 </div>

client/src/app/pages/release-candidate-details/release-candidate-details.component.html

@@ -32,7 +32,7 @@ <h2 class="text-2xl flex items-center gap-2">
         <div class="flex gap-1 items-center text-sm">
           <div>created by</div>
           @if (releaseCandidate.createdBy?.avatarUrl) {
-            <p-avatar class="size-4" shape="circle" [image]="releaseCandidate.createdBy.avatarUrl" />
+            <p-avatar class="size-4" shape="circle" [image]="releaseCandidate.createdBy?.avatarUrl" />
           } @else {
             <i-tabler name="user" class="size-4 text-gray-600 border-2 rounded-full" />
           }

server/application-server/openapi.yaml

@@ -1354,7 +1354,7 @@ components:
         commitSha:
           type: string
       required:
-      - branchName
+      - commitSha
       - environmentId
     WorkflowRunDto:
       type: object

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/DeployRequest.java

@@ -3,4 +3,4 @@
 import org.springframework.lang.NonNull;
 
 public record DeployRequest(
-    @NonNull Long environmentId, @NonNull String branchName, String commitSha) {}
+    @NonNull Long environmentId, String branchName, @NonNull String commitSha) {}

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/DeploymentService.java

@@ -71,8 +71,6 @@ public void deployToEnvironment(DeployRequest deployRequest) {
     validateDeployRequest(deployRequest);
     validateEnvironmentAndPermissions(deployRequest.environmentId());
 
-    String commitSha = determineCommitSha(deployRequest);
-
     Environment environment = lockEnvironment(deployRequest.environmentId());
     Workflow deploymentWorkflow = environment.getDeploymentWorkflow();
 
@@ -83,19 +81,21 @@ public void deployToEnvironment(DeployRequest deployRequest) {
     // Set the PR associated with the deployment
     Optional<PullRequest> optionalPullRequest =
         pullRequestRepository.findOpenPrByBranchNameOrSha(
-            RepositoryContext.getRepositoryId(), deployRequest.branchName(), commitSha);
+            RepositoryContext.getRepositoryId(),
+            deployRequest.branchName(),
+            deployRequest.commitSha());
 
     HeliosDeployment heliosDeployment =
-        createHeliosDeployment(environment, deployRequest, commitSha, optionalPullRequest);
+        createHeliosDeployment(environment, deployRequest, optionalPullRequest);
     Map<String, Object> workflowParams = createWorkflowParams(deployRequest, environment);
 
     dispatchWorkflow(
         environment, deploymentWorkflow, deployRequest, workflowParams, heliosDeployment);
   }
 
   private void validateDeployRequest(DeployRequest deployRequest) {
-    if (deployRequest.environmentId() == null || deployRequest.branchName() == null) {
-      throw new DeploymentException("Environment ID and branch name must not be null");
+    if (deployRequest.environmentId() == null || deployRequest.commitSha() == null) {
+      throw new DeploymentException("Environment ID and commit sha must not be null");
     }
   }
 
@@ -110,18 +110,6 @@ private void validateEnvironmentAndPermissions(Long environmentId) {
     }
   }
 
-  private String determineCommitSha(DeployRequest deployRequest) {
-    String commitSha = deployRequest.commitSha();
-
-    return commitSha != null
-        ? commitSha
-        : this.branchService
-            .getBranchByRepositoryIdAndName(
-                RepositoryContext.getRepositoryId(), deployRequest.branchName())
-            .orElseThrow(() -> new DeploymentException("Branch not found"))
-            .commitSha();
-  }
-
   private Environment lockEnvironment(Long environmentId) {
     // First, get the environment
     Environment environment =
@@ -147,14 +135,13 @@ private Environment lockEnvironment(Long environmentId) {
   private HeliosDeployment createHeliosDeployment(
       Environment environment,
       DeployRequest deployRequest,
-      String commitSha,
       Optional<PullRequest> optionalPullRequest) {
     HeliosDeployment heliosDeployment = new HeliosDeployment();
     heliosDeployment.setEnvironment(environment);
     heliosDeployment.setUser(authService.getUserId());
     heliosDeployment.setStatus(HeliosDeployment.Status.WAITING);
     heliosDeployment.setBranchName(deployRequest.branchName());
-    heliosDeployment.setSha(commitSha);
+    heliosDeployment.setSha(deployRequest.commitSha());
     heliosDeployment.setCreator(authService.getUserFromGithubId());
     heliosDeployment.setPullRequest(optionalPullRequest.orElse(null));
     return heliosDeploymentRepository.saveAndFlush(heliosDeployment);