Feature/register component with registration flag

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/ProjectComponentsController.java

@@ -28,9 +28,15 @@ public class ProjectComponentsController implements ProjectComponentsApi {
 
     @Override
     public ResponseEntity<CreateComponentResponse> createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
-        componentsFacade.provisionProjectComponent(projectId, createComponentRequest);
 
-        log.info("Created component '{}' for project '{}'", createComponentRequest.getName(), projectId);
+        if (Boolean.TRUE.equals(createComponentRequest.getRegisterOnly())) {
+            componentsFacade.registerProjectComponent(projectId, createComponentRequest);
+            log.info("Registered component '{}' for project '{}'", createComponentRequest.getName(), projectId);
+        } else {
+            componentsFacade.provisionProjectComponent(projectId, createComponentRequest);
+            log.info("Created component '{}' for project '{}'", createComponentRequest.getName(), projectId);
+        }
+
         return componentResponseMapper.toResponseEntity(
                 ComponentsResponseFactory.entityCreated(projectId, createComponentRequest.getName())
         );

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandler.java

@@ -10,6 +10,7 @@
 import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
 import org.opendevstack.apiservice.project.exception.ComponentErrorKey;
 import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
 import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
 import org.opendevstack.apiservice.project.model.CreateComponentResponse;
 import org.springframework.http.HttpStatus;
@@ -142,6 +143,22 @@ public ResponseEntity<CreateComponentResponse> handleComponentCreationException(
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
     }
 
+    @ExceptionHandler(ComponentRegistrationException.class)
+    public ResponseEntity<CreateComponentResponse> handleComponentRegisterException(
+            ComponentRegistrationException ex,
+            HttpServletRequest request) {
+
+        log.error("Component registration failed: {}", ex.getMessage(), ex);
+
+        CreateComponentResponse response = ComponentsResponseFactory.internalError(
+                request.getRequestURI(),
+                ex.getMessage(),
+                ComponentErrorKey.INTERNAL_ERROR
+        );
+
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+    }
+
     @ExceptionHandler(ComponentDeletionException.class)
     public ResponseEntity<Void> handleComponentDeletionException(
             ComponentDeletionException ex,

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/exception/ComponentRegistrationException.java

@@ -0,0 +1,12 @@
+package org.opendevstack.apiservice.project.exception;
+
+public class ComponentRegistrationException extends RuntimeException {
+
+    public ComponentRegistrationException(String message) {
+        super(message);
+    }
+
+    public ComponentRegistrationException(String message, Exception e) {
+        super(message, e);
+    }
+}

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java

@@ -3,9 +3,10 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItem;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProvisionActionParameter;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItem;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisionActionParameter;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
 import org.opendevstack.apiservice.externalservice.marketplace.service.CatalogItemOperations;
 import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService;
 import org.opendevstack.apiservice.project.exception.CatalogItemNotFoundException;
@@ -14,6 +15,7 @@
 import org.opendevstack.apiservice.project.exception.ComponentCreationException;
 import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
 import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
 import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
 import org.opendevstack.apiservice.project.mapper.MarketplaceMapper;
 import org.opendevstack.apiservice.project.model.Component;
@@ -175,13 +177,19 @@ private boolean isAccessDeniedCause(Throwable throwable) {
         return false;
     }
 
-    public boolean registerProjectComponent(String projectId, String componentId) {
+    public void registerProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
+        String componentId = createComponentRequest.getName();
+        String productId = createComponentRequest.getProductId();
         try {
-            marketplaceExternalService.registerProjectComponent(projectId, componentId);
-            return true;
+            List<ProvisioningStatusUpdateRequestAllOfParameters> parameters = marketplaceMapper
+                    .mapCreateComponentRequestToRegisterComponentParameterList(createComponentRequest);
+            marketplaceExternalService.registerProjectComponent(projectId, componentId, productId, parameters);
+            log.info("Successfully registered component '{}' for project '{}'", componentId, projectId);
         } catch (MarketplaceException e) {
-            log.error("Failed to register component in marketplace for project with id {}", projectId, e);
-            return false;
+            log.error("Failed to register component '{}' for project '{}': {}", componentId, projectId, e.getMessage(), e);
+            throw new ComponentRegistrationException(
+                    String.format("Failed to register component '%s' for project '%s': %s", componentId, projectId, e.getMessage()), e
+            );
         }
     }
 }

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/mapper/MarketplaceMapper.java

@@ -2,11 +2,12 @@
 
 import org.mapstruct.Mapper;
 import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItem;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItemUserAction;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItemUserActionParameter;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProvisionActionParameter;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItem;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItemUserAction;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItemUserActionParameter;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisionActionParameter;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
 import org.opendevstack.apiservice.project.model.Component;
 import org.opendevstack.apiservice.project.model.CreateComponentRequest;
 import org.opendevstack.apiservice.project.model.EnvironmentsDTO;
@@ -67,10 +68,40 @@ default List<ProvisionActionParameter> mapCreateComponentRequestToCreateComponen
         return parameters;
     }
 
+    default List<ProvisioningStatusUpdateRequestAllOfParameters> mapCreateComponentRequestToRegisterComponentParameterList(
+            CreateComponentRequest createComponentRequest) {
+        if (createComponentRequest == null) {
+            return List.of();
+        }
+
+        List<ProvisioningStatusUpdateRequestAllOfParameters> parameters = new ArrayList<>();
+        if (createComponentRequest.getParams() != null && !createComponentRequest.getParams().isEmpty()) {
+            createComponentRequest.getParams().forEach((name, value) -> {
+                parameters.add(createRegisterParameter(name, value));
+            });
+        }
+
+        return parameters;
+    }
+
     default ProvisionActionParameter createParameter(String name, Object value, String type) {
         return new ProvisionActionParameter().name(name).type(type).value(value);
     }
 
+    default ProvisioningStatusUpdateRequestAllOfParameters createRegisterParameter(String name, Object value) {
+        List<String> values;
+        if (value == null) {
+            values = List.of("");
+        } else if (value instanceof List<?> list) {
+            values = list.stream()
+                    .map(Object::toString)
+                    .toList();
+        } else {
+            values = List.of(value.toString());
+        }
+        return new ProvisioningStatusUpdateRequestAllOfParameters().name(name).values(values);
+    }
+
     /**
      * Builds a map of parameter name -> type from the catalog item user actions.
      * The type comes from the {@link CatalogItemUserActionParameter#getType()} value

api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/ProjectComponentsControllerTest.java

@@ -66,6 +66,25 @@ void create_project_component_returns_ok_with_component_name_in_path() {
         verify(componentsFacade).provisionProjectComponent(projectId, request);
     }
 
+    @Test
+    void create_project_component_with_register_only_returns_ok_with_component_name_in_path() {
+        String projectId = "testProjectId";
+        CreateComponentRequest request = buildTestCreateComponentRequest(); // name = "testcomponent"
+        request.setRegisterOnly(Boolean.TRUE);
+
+        doNothing().when(componentsFacade).registerProjectComponent(eq(projectId), eq(request));
+
+        ResponseEntity<CreateComponentResponse> response = projectComponentsController.createProjectComponent(projectId, request);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isNotNull();
+        assertThat(response.getBody().getHttpStatus()).isEqualTo(HttpStatus.OK.name());
+        assertThat(response.getBody().getErrorKey()).isEqualTo("000");
+        assertThat(response.getBody().getMessage()).isEqualTo("Component created");
+        assertThat(response.getBody().getPath()).isEqualTo("/api/pub/v0/projects/testProjectId/components/testcomponent");
+        verify(componentsFacade).registerProjectComponent(projectId, request);
+    }
+
     @Test
     void create_project_component_propagates_exception_when_facade_throws_exception() {
         String projectId = "testProjectId";
@@ -80,6 +99,38 @@ void create_project_component_propagates_exception_when_facade_throws_exception(
         verify(componentsFacade).provisionProjectComponent(projectId, request);
     }
 
+    @Test
+    void create_project_component_with_register_only_propagates_exception_when_facade_throws_exception() {
+        String projectId = "testProjectId";
+        CreateComponentRequest request = buildTestCreateComponentRequest();
+        request.setRegisterOnly(Boolean.TRUE);
+
+        org.mockito.Mockito.doThrow(new RuntimeException("boom"))
+                .when(componentsFacade).registerProjectComponent(eq(projectId), eq(request));
+
+        assertThatThrownBy(() -> projectComponentsController.createProjectComponent(projectId, request))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessage("boom");
+        verify(componentsFacade).registerProjectComponent(projectId, request);
+    }
+
+    @Test
+    void create_project_component_with_register_only_false_delegates_to_provision_project_component() {
+        String projectId = "testProjectId";
+        CreateComponentRequest request = buildTestCreateComponentRequest();
+        request.setRegisterOnly(Boolean.FALSE);
+
+        doNothing().when(componentsFacade).provisionProjectComponent(eq(projectId), any(CreateComponentRequest.class));
+
+        ResponseEntity<CreateComponentResponse> response = projectComponentsController.createProjectComponent(projectId, request);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(response.getBody()).isNotNull();
+        assertThat(response.getBody().getMessage()).isEqualTo("Component created");
+        assertThat(response.getBody().getPath()).isEqualTo("/api/pub/v0/projects/testProjectId/components/testcomponent");
+        verify(componentsFacade).provisionProjectComponent(projectId, request);
+    }
+
     @Test
     void get_project_component_returns_ok_when_component_exists() throws MarketplaceException {
         String projectId = "projectId";

api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/controller/advice/ProjectComponentsExceptionHandlerTest.java

@@ -9,6 +9,7 @@
 import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
 import org.opendevstack.apiservice.project.exception.ComponentCreationException;
 import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
 import org.opendevstack.apiservice.project.model.CreateComponentResponse;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
@@ -149,6 +150,20 @@ void handle_component_already_exists_exception_returns_conflict() {
         assertThat(response.getBody().getMessage()).isEqualTo("This component name already exists, please choose another name.");
     }
 
+    @Test
+    void handle_component_registration_exception_returns_internal_server_error() {
+        ComponentRegistrationException exception = new ComponentRegistrationException("Registration failed");
+
+        ResponseEntity<CreateComponentResponse> response = handler.handleComponentRegisterException(exception, request);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
+        assertThat(response.getBody()).isNotNull();
+        assertThat(response.getBody().getHttpStatus()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.name());
+        assertThat(response.getBody().getErrorKey()).isEqualTo("003");
+        assertThat(response.getBody().getMessage()).isEqualTo("Registration failed");
+        assertThat(response.getBody().getPath()).isEqualTo("/api/pub/v0/projects/test-project/components/");
+    }
+
     @Test
     void handle_generic_exception_returns_internal_server_error() {
         RuntimeException exception = new RuntimeException("boom");

api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsFacadeTest.java

@@ -7,13 +7,14 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.CatalogItem;
-import org.opendevstack.apiservice.externalservice.marketplace.openapi.model.ProjectComponentExtendedInfo;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.CatalogItem;
+import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
 import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService;
 import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
 import org.opendevstack.apiservice.project.exception.ComponentCreationException;
 import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
 import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
+import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
 import org.opendevstack.apiservice.project.mapper.MarketplaceMapper;
 import org.opendevstack.apiservice.project.model.Component;
 import org.opendevstack.apiservice.project.model.ComponentsStatusDTO;
@@ -28,6 +29,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCatalogItem;
@@ -103,8 +105,8 @@ void create_project_component_throws_creation_exception_when_marketplace_returns
         verify(marketplaceExternalService).provisionProjectComponent(eq("testProject"), anyList());
     }
 
-        @Test
-        void create_project_component_throws_already_exists_when_marketplace_returns_conflict() throws MarketplaceException {
+    @Test
+    void create_project_component_throws_already_exists_when_marketplace_returns_conflict() throws MarketplaceException {
         CreateComponentRequest request = buildTestCreateComponentRequest();
         HttpClientErrorException conflict = HttpClientErrorException.Conflict.create(
             HttpStatus.CONFLICT,
@@ -121,8 +123,52 @@ void create_project_component_throws_already_exists_when_marketplace_returns_con
             .isInstanceOf(ComponentAlreadyExistsException.class)
             .hasMessage("This component name already exists, please choose another name.");
         verify(marketplaceExternalService).provisionProjectComponent(eq("testProject"), anyList());
-        }
+    }
+
+    @Test
+    void register_project_component_ends_successfully_when_marketplace_registration_succeeds() throws MarketplaceException {
+        CreateComponentRequest request = buildTestCreateComponentRequest();
+        String projectId = "testProjectId";
+
+        doNothing().when(marketplaceExternalService).registerProjectComponent(eq(projectId), anyString(), anyString(), anyList());
+
+        componentsFacade.registerProjectComponent(projectId, request);
+
+        verify(marketplaceExternalService).registerProjectComponent(eq(projectId), anyString(), anyString(), anyList());
+    }
+
+    @Test
+    void register_project_component_passes_correct_component_id_and_product_id_to_marketplace() throws MarketplaceException {
+        CreateComponentRequest request = buildTestCreateComponentRequest();
+        // name = "testcomponent", productId = "testProductId"
+        String projectId = "testProjectId";
+
+        doNothing().when(marketplaceExternalService).registerProjectComponent(
+                eq(projectId), eq("testcomponent"), eq("testProductId"), anyList());
+
+        componentsFacade.registerProjectComponent(projectId, request);
 
+        verify(marketplaceExternalService).registerProjectComponent(
+                eq(projectId), eq("testcomponent"), eq("testProductId"), anyList());
+    }
+
+    @Test
+    void register_project_component_throws_registration_exception_wrapping_original_cause() throws MarketplaceException {
+        CreateComponentRequest request = buildTestCreateComponentRequest();
+        String projectId = "testProjectId";
+        MarketplaceException originalCause = new MarketplaceException("downstream error", new RuntimeException("root"));
+
+        doThrow(originalCause)
+                .when(marketplaceExternalService)
+                .registerProjectComponent(eq(projectId), anyString(), anyString(), anyList());
+
+        assertThatThrownBy(() -> componentsFacade.registerProjectComponent(projectId, request))
+                .isInstanceOf(ComponentRegistrationException.class)
+                .hasMessage("Failed to register component 'testcomponent' for project 'testProjectId': downstream error")
+                .hasCause(originalCause);
+
+        verify(marketplaceExternalService).registerProjectComponent(eq(projectId), anyString(), anyString(), anyList());
+    }
 
     @Test
     void delete_project_component_ends_successfully_for_existing_component() throws MarketplaceException {