From 590a6cbf8dfc2e8781baf7db109ddf9b722d04e7 Mon Sep 17 00:00:00 2001
From: Pascal Klesse <pascal.klesse@lenne.tech>
Date: Fri, 20 Dec 2024 17:04:01 +0100
Subject: [PATCH] fix: fixes

---
 README.md                                     | 11 +++++------
 projects/api/src/server/extern.controller.ts  |  1 +
 .../server/modules/build/build.resolver.ts    |  2 +-
 .../src/server/modules/build/build.service.ts | 19 ++++++-------------
 .../build/inputs/build-create.input.ts        |  9 ---------
 5 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index d708158..be93802 100644
--- a/README.md
+++ b/README.md
@@ -53,12 +53,11 @@ Now Traefik UI will be available at `lb.YOUR_URL` and deploy.party at `YOUR_URL`
 Traefik has basic auth lock and can be accessed with the `USERNAME` and `PASSWORD` you set in the init.sh script.
 
 On **local setup**:
-- Traefik UI: [http://localhost:8080](http://localhost:8080)
-- Deploy Party API: [http://localhost:3000](http://localhost:3000)
-- Deploy Party: [http://localhost:3001](http://localhost:3001)
-- Deploy Party Terminal API: [http://localhost:3002](http://localhost:3002)
-- Minio API: [http://localhost:3003](http://localhost:3003)
-- Minio UI: [http://localhost:3004](http://localhost:3004)
+- Deploy Party: [http://[IP]:3001](http://[IP]:3001)
+- Minio UI: [http://[IP]:3004](http://[IP]:9000)
+- Deploy Party API: [http://[IP]:3000](http://[IP]:3000)
+- Deploy Party Terminal API: [http://[IP]:3002](http://[IP]:3002)
+- Minio API: [http://[IP]:3003](http://[IP]:9001)
 
 ## First steps
 Default credentails are:  
diff --git a/projects/api/src/server/extern.controller.ts b/projects/api/src/server/extern.controller.ts
index eb8f68b..bb21364 100644
--- a/projects/api/src/server/extern.controller.ts
+++ b/projects/api/src/server/extern.controller.ts
@@ -64,6 +64,7 @@ export class ExternController {
       // create build (queue handler will start build)
       await this.buildService.create({
         container: container.id,
+      }, {
         callbackUrl: input.callbackUrl,
         targetVersion: input.targetVersion,
         deploymentType: input.deploymentType,
diff --git a/projects/api/src/server/modules/build/build.resolver.ts b/projects/api/src/server/modules/build/build.resolver.ts
index 1b7ceed..0512f61 100644
--- a/projects/api/src/server/modules/build/build.resolver.ts
+++ b/projects/api/src/server/modules/build/build.resolver.ts
@@ -102,7 +102,7 @@ export class BuildResolver {
     @GraphQLUser() user: User,
     @Args('input') input: BuildCreateInput
   ): Promise<Build> {
-    return await this.buildService.create(input, {
+    return await this.buildService.create(input, null, {
       currentUser: user,
       fieldSelection: { info, select: 'createBuild' },
       inputType: BuildCreateInput
diff --git a/projects/api/src/server/modules/build/build.service.ts b/projects/api/src/server/modules/build/build.service.ts
index 455229b..4f28e17 100644
--- a/projects/api/src/server/modules/build/build.service.ts
+++ b/projects/api/src/server/modules/build/build.service.ts
@@ -72,7 +72,7 @@ export class BuildService extends CrudService<Build> {
     return this.buildQueue.resume();
   }
 
-  override async create(input: BuildCreateInput, serviceOptions?: ServiceOptions): Promise<Build> {
+  override async create(input: BuildCreateInput, additionalInfos?: AdditionalBuildInfos, serviceOptions?: ServiceOptions): Promise<Build> {
     const lastBuild = await this.getLastBuild(getStringIds(input.container));
 
     if (lastBuild && lastBuild?.status === BuildStatus.QUEUE) {
@@ -84,25 +84,18 @@ export class BuildService extends CrudService<Build> {
     const createdBuild = await super.create(input, serviceOptions);
     await this.containerService.update(getStringIds(createdBuild.container), {lastBuild: createdBuild.id})
 
-    if (input?.callbackUrl) {
-      await axios.post(input.callbackUrl, {
+    if (additionalInfos?.callbackUrl) {
+      await axios.post(additionalInfos.callbackUrl, {
         status: BuildStatus.QUEUE,
-        deploymentType: input?.deploymentType,
-        currentVersion: input?.currentVersion,
-        targetVersion: input?.targetVersion,
-        duration: 0
+        duration: 0,
+          ...additionalInfos
       });
     }
 
     await this.buildQueue.add({
       containerId: getStringIds(input.container),
       buildId: createdBuild.id,
-      additionalInfos: {
-        callbackUrl: input?.callbackUrl,
-        deploymentType: input?.deploymentType,
-        currentVersion: input?.currentVersion,
-        targetVersion: input?.targetVersion
-      }
+      additionalInfos
     }, {jobId: createdBuild.id});
 
     return createdBuild;
diff --git a/projects/api/src/server/modules/build/inputs/build-create.input.ts b/projects/api/src/server/modules/build/inputs/build-create.input.ts
index 165d614..b0e1534 100644
--- a/projects/api/src/server/modules/build/inputs/build-create.input.ts
+++ b/projects/api/src/server/modules/build/inputs/build-create.input.ts
@@ -3,7 +3,6 @@ import {Field, InputType} from '@nestjs/graphql';
 import {IsOptional} from 'class-validator';
 import {BuildStatus} from '../enums/build-status.enum';
 import {BuildInput} from './build.input';
-import {DeploymentType} from "../../container/enums/deployment-type.enum";
 
 /**
  * Build create input
@@ -46,12 +45,4 @@ export class BuildCreateInput extends BuildInput {
   })
   @IsOptional()
   override status?: BuildStatus = undefined;
-
-  callbackUrl?: string;
-
-  targetVersion?: string;
-
-  currentVersion?: string;
-
-  deploymentType?: DeploymentType;
 }