feat: _Support app service_

CHANGELOG.md

@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
  - NA
 
+## [1.3.5] - 2023-07-12
+
+### Added
+ - Support for tool app/service type in autosetup
+
 ## [1.3.4] - 2023-07-11
 
 ### Changed

charts/orchestrator/Chart.yaml

@@ -38,13 +38,13 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.4
+version: 1.3.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.3.4"
+appVersion: "1.3.5"
 
 dependencies:
   - condition: postgresql.enabled

charts/orchestrator/README.md

@@ -1,6 +1,6 @@
 # autosetup
 
-![Version: 1.3.4](https://img.shields.io/badge/Version-1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.4](https://img.shields.io/badge/AppVersion-1.3.4-informational?style=flat-square)
+![Version: 1.3.5](https://img.shields.io/badge/Version-1.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.5](https://img.shields.io/badge/AppVersion-1.3.5-informational?style=flat-square)
 
 This service will help service provider to set up DFT/SDE with EDC and EDC as service in service provider environment.
 

pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>auto-setup</artifactId>
-	<version>1.3.4</version>
+	<version>1.3.5</version>
 	<name>auto-setup</name>
 	<description>auto-setup</description>
 	<properties>

src/main/java/org/eclipse/tractusx/autosetup/controller/AutoSetupHandlerController.java

@@ -22,12 +22,9 @@
 
 import java.util.UUID;
 
-import jakarta.validation.Valid;
-
 import org.eclipse.tractusx.autosetup.manager.AutoSetupTriggerManager;
 import org.eclipse.tractusx.autosetup.model.AutoSetupRequest;
 import org.eclipse.tractusx.autosetup.model.AutoSetupResponse;
-import org.eclipse.tractusx.autosetup.model.DFTUpdateRequest;
 import org.eclipse.tractusx.autosetup.service.AutoSetupOrchitestratorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -44,6 +41,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 @RestController
 @Tag(name = "AutoSetup", description = "Auto setup controller to perform all operation")
@@ -61,18 +59,6 @@ public String getAllInstallPackages() {
 		return appHandlerService.getAllInstallPackages();
 	}
 
-	/// internal access
-	// update dft packages input: keycloack details for frontend and backend,
-	// digital twin details
-	@Operation(summary = "Update DFT only packages", description = "This will update only DFT packages")
-	@ApiResponses(value = {
-			@ApiResponse(responseCode = "200", description = "Created", content = @Content(schema = @Schema(implementation = UUID.class))) })
-	@PutMapping("/internal/update-package/{executionId}")
-	public String updateDftPackage(@PathVariable("executionId") UUID executionId,
-			@RequestBody DFTUpdateRequest dftUpdateRequest) {
-		return appHandlerService.updateDftPackage(executionId.toString(), dftUpdateRequest);
-	}
-
 	// portal access
 	@Operation(summary = "Start autosetup process", description = "This API will use to start the Auto setup process")
 	@ApiResponses(value = {

src/main/java/org/eclipse/tractusx/autosetup/manager/PortalIntegrationManager.java

@@ -91,9 +91,13 @@ public Map<String, String> postServiceInstanceResultAndGetTenantSpecs(Customer c
 
 			ServiceInstanceResultRequest serviceInstanceResultRequest = ServiceInstanceResultRequest.builder()
 					.requestId(subscriptionId).offerUrl(applicationURL).build();
-
-			serviceInstanceResultResponse = portalIntegrationProxy.postServiceInstanceResultAndGetTenantSpecs(portalUrl,
-					header, serviceInstanceResultRequest);
+
+			if ("app".equalsIgnoreCase(tool.getType()))
+				serviceInstanceResultResponse = portalIntegrationProxy.postAppInstanceResultAndGetTenantSpecs(portalUrl,
+						header, serviceInstanceResultRequest);
+			else
+				serviceInstanceResultResponse = portalIntegrationProxy
+						.postServiceInstanceResultAndGetTenantSpecs(portalUrl, header, serviceInstanceResultRequest);
 
 			if (serviceInstanceResultResponse != null) {
 

src/main/java/org/eclipse/tractusx/autosetup/model/SelectedTools.java

@@ -34,6 +34,8 @@
 public class SelectedTools {
 
 	private ToolType tool;
+
+	private String type;
 
 	private String label;
 

src/main/java/org/eclipse/tractusx/autosetup/portal/proxy/PortalIntegrationProxy.java

@@ -41,10 +41,17 @@ public interface PortalIntegrationProxy {
 	KeycloakTokenResponse readAuthToken(URI url, @RequestBody MultiValueMap<String, Object> body);
 
 	@PostMapping("/api/Apps/autoSetup")
+	public ServiceInstanceResultResponse postAppInstanceResultAndGetTenantSpecs(URI url,
+			@RequestHeader Map<String, String> header,
+			@RequestBody ServiceInstanceResultRequest serviceInstanceResultRequest);
+
+
+	@PostMapping("/api/Services/autoSetup")
 	public ServiceInstanceResultResponse postServiceInstanceResultAndGetTenantSpecs(URI url,
 			@RequestHeader Map<String, String> header,
 			@RequestBody ServiceInstanceResultRequest serviceInstanceResultRequest);
 
+
 	@PostMapping("/api/administration/connectors/managed-daps")
 	public String manageConnector(URI url, @RequestHeader Map<String, String> header,
 			@RequestBody MultiValueMap<String, Object> body);