Commit 9d4e6b1f authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: response in ServiceCandidateResource.delete status 204 and no content

parent c4a0a3c0

src/main/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCandidateService.java

+5 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ public class ServiceCandidateService { 
        throw new ServiceNotFoundException("Service Candidate with id " + id + " not found");

    }



    @Transactional

    public Optional<ServiceCandidateEntity> getOptionalServiceCandidate(String id) {

        return serviceCandidateRepository.findById(id);

    }



    @Transactional

    public ServiceCandidateEntity findOrCreateServiceCandidateEntity(

            ServiceCandidateEntity serviceCandidate, UUID serviceSpecificationId) {

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/candidate/IntegrationCandidateTest.java→src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/candidate/ServiceCandidateResourceTest.java

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; 
import static jakarta.ws.rs.core.Response.Status.CONFLICT;

import static jakarta.ws.rs.core.Response.Status.CREATED;

import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;

import static jakarta.ws.rs.core.Response.Status.NO_CONTENT;

import static jakarta.ws.rs.core.Response.Status.OK;

import static org.assertj.core.api.Assertions.assertThat;

import static org.etsi.osl.hypo.api.tmf.helpers.TestHelpers.getObjectMapper;
@@ -45,7 +46,7 @@ import org.junit.jupiter.params.ParameterizedTest; 


@QuarkusTest

@TestSecurity(authorizationEnabled = false)

class IntegrationCandidateTest {

class ServiceCandidateResourceTest {



    @Inject ServiceCandidateService serviceCandidateService;

    @Inject ServiceSpecificationService serviceSpecificationService;
@@ -232,7 +233,7 @@ class IntegrationCandidateTest { 
                .when()

                .delete(serviceCandidateUrl + "/{id}")

                .then()

                .statusCode(OK.getStatusCode());

                .statusCode(NO_CONTENT.getStatusCode());

    }



    @Test

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCandidateServiceTest.java

+6 −18
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import java.util.Collections; 
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Optional;

import java.util.UUID;

import net.joshka.junit.json.params.JsonFileSource;

import org.etsi.osl.hypo.api.tmf.common.exception.DuplicateKeyException;
@@ -139,7 +140,7 @@ class ServiceCandidateServiceTest { 
        ServiceCandidateCreateRequest serviceCandidateCreateRequest =

                objectMapper.readValue(candidateRequest.toString(), ServiceCandidateCreateRequest.class);

        ServiceCandidate serviceCandidate =

                serviceCandidateService.responseFromCreateRequest(serviceCandidateCreateRequest);

                serviceCandidateService.findOrCreateCandidate(serviceCandidateCreateRequest);



        assertThat(serviceCandidate.getId()).isNotNull();

        assertThat(serviceCandidate.getVersion()).isEqualTo(serviceCandidateCreateRequest.getVersion());
@@ -272,24 +273,11 @@ class ServiceCandidateServiceTest { 


        String serviceCandidateId = serviceCandidate.getId().toString();



        ServiceCandidate responseFromDeleteRequest =

        serviceCandidateService.responseFromDeleteRequest(serviceCandidateId);



        assertThat(responseFromDeleteRequest.getId()).hasToString(serviceCandidateId);

        assertThat(responseFromDeleteRequest.getVersion())

                .isEqualTo(serviceCandidateCreateRequest.getVersion());

        assertThat(responseFromDeleteRequest.getType())

                .isEqualTo(serviceCandidateCreateRequest.getType());

        assertThat(responseFromDeleteRequest.getHref())

                .isEqualTo(serviceCandidateCreateRequest.getHref());

        assertThat(responseFromDeleteRequest.getBaseType())

                .isEqualTo(serviceCandidateCreateRequest.getBaseType());

        assertThat(responseFromDeleteRequest.getDescription())

                .isEqualTo(serviceCandidateCreateRequest.getDescription());



        ServiceSpecificationRef serviceSpecificationRef =

                responseFromDeleteRequest.getServiceSpecificationRef();

        assertThat(serviceSpecificationRef).isNull();

        Optional<ServiceCandidateEntity> optionalServiceCandidateEntity =

                serviceCandidateService.getOptionalServiceCandidate(serviceCandidateId);

        assertThat(optionalServiceCandidateEntity).isEmpty();

    }



    @Test