Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: return a Distribution object #687

Merged
merged 1 commit into from
Jul 10, 2024
Merged

fix: return a Distribution object #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/fr/insee/rmes/bauhaus_services/distribution/DistributionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package fr.insee.rmes.bauhaus_services.distribution;

import fr.insee.rmes.exceptions.RmesException;
import fr.insee.rmes.model.dataset.Distribution;
import fr.insee.rmes.model.dataset.PatchDistribution;

public interface DistributionService {

String getDistributions() throws RmesException;

String getDistributionByID(String id) throws RmesException;
Distribution getDistributionByID(String id) throws RmesException;

String create(String body) throws RmesException;

Expand Down
15 changes: 7 additions & 8 deletions src/main/java/fr/insee/rmes/bauhaus_services/distribution/DistributionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,15 @@ public String getDistributions() throws RmesException {
}

@Override
public String getDistributionByID(String id) throws RmesException {
JSONObject distribution = repoGestion.getResponseAsObject(DistributionQueries.getDistribution(id, getDistributionGraph()));
public Distribution getDistributionByID(String id) throws RmesException {
JSONObject distribution_raw = repoGestion.getResponseAsObject(DistributionQueries.getDistribution(id, getDistributionGraph()));
EmmanuelDemey marked this conversation as resolved.
Show resolved Hide resolved

if (distribution.isEmpty()){
if (distribution_raw.isEmpty()){
throw new RmesNotFoundException("This distribution does not exist");
}

return distribution.toString();
Distribution distribution = Deserializer.deserializeBody(distribution_raw.toString(), Distribution.class);
EmmanuelDemey marked this conversation as resolved.
Show resolved Hide resolved
return distribution;
EmmanuelDemey marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down Expand Up @@ -129,8 +130,7 @@ public String publishDistribution(String id) throws RmesException {

@Override
public void deleteDistributionId(String distributionId) throws RmesException{
String distributionString = getDistributionByID(distributionId);
Distribution distribution = Deserializer.deserializeBody(distributionString, Distribution.class);
Distribution distribution = getDistributionByID(distributionId);
if (isPublished(distribution)){
throw new RmesBadRequestException(ErrorCodes.DISTRIBUTION_DELETE_ONLY_UNPUBLISHED, "Only unpublished distributions can be deleted");
}
Expand Down Expand Up @@ -194,8 +194,7 @@ private void validate(Distribution distribution) throws RmesException {

@Override
public void patchDistribution(String distributionId, PatchDistribution patchDistribution) throws RmesException {
String distributionByID = getDistributionByID(distributionId);
Distribution distribution = Deserializer.deserializeBody(distributionByID, Distribution.class);
Distribution distribution = getDistributionByID(distributionId);
if (patchDistribution.getUpdated() == null && patchDistribution.getByteSize() == null && patchDistribution.getUrl() == null){
throw new RmesBadRequestException(DISTRIUBTION_PATCH_INCORRECT_BODY,"One of these attributes is required : updated, byteSize or url");
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/insee/rmes/webservice/distribution/DistributionResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public String getDistributions() throws RmesException {
@GetMapping("/{id}")
@Operation(operationId = "getDistribution", summary = "Get a distributions",
responses = {@ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Distribution.class))))})
public String getDistribution(@PathVariable(Constants.ID) String id) throws RmesException {
public Distribution getDistribution(@PathVariable(Constants.ID) String id) throws RmesException {
return this.distributionService.getDistributionByID(id);
}

Expand Down
5 changes: 3 additions & 2 deletions src/test/java/fr/insee/rmes/bauhaus_services/distribution/DistributionServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import fr.insee.rmes.exceptions.RmesBadRequestException;
import fr.insee.rmes.exceptions.RmesException;
import fr.insee.rmes.exceptions.RmesNotFoundException;
import fr.insee.rmes.model.dataset.Distribution;
import fr.insee.rmes.model.dataset.PatchDistribution;
import fr.insee.rmes.utils.DateUtils;
import fr.insee.rmes.utils.IdGenerator;
Expand Down Expand Up @@ -81,8 +82,8 @@ void shouldReturnDataset() throws RmesException, JSONException {
when(repositoryGestion.getResponseAsObject("query")).thenReturn(object);
try (MockedStatic<DistributionQueries> mockedFactory = Mockito.mockStatic(DistributionQueries.class)) {
mockedFactory.when(() -> DistributionQueries.getDistribution(eq("1"), any())).thenReturn("query");
String query = distributionService.getDistributionByID("1");
Assertions.assertEquals("{\"id\":\"1\"}", query);
Distribution distribution = distributionService.getDistributionByID("1");
Assertions.assertEquals("1", distribution.getId());
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/test/java/fr/insee/rmes/webservice/DistributionResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import fr.insee.rmes.config.auth.security.UserDecoder;
import fr.insee.rmes.config.auth.user.User;
import fr.insee.rmes.exceptions.RmesException;
import fr.insee.rmes.model.dataset.Distribution;
import fr.insee.rmes.webservice.distribution.DistributionResources;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -41,8 +42,11 @@ void shouldReturn200IfRmesExceptionWhenFetchingDatasets() throws RmesException {

@Test
void shouldReturn200IfRmesExceptionWhenFetchingDistributionById() throws RmesException {
when(distributionService.getDistributionByID(anyString())).thenReturn("result");
Assertions.assertEquals("result", distributionResources.getDistribution(""));
Distribution distribution = new Distribution();
distribution.setId("1");

when(distributionService.getDistributionByID("1")).thenReturn(distribution);
Assertions.assertEquals(distribution, distributionResources.getDistribution("1"));
}

@Test
Expand Down
Loading