vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-10-23 01:52:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Julien Kirch 2023-06-07 14:21:43 +02:00
parent 57ce15bd9f
commit 151d6ee7c5
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
View File

@ -497,14 +497,14 @@ public class DocumentResource extends BaseResource {
.add("color", tagDto.getColor())); .add("color", tagDto.getColor()));
} }
long filesCount; Long filesCount;
Collection<File> filesOfDocument = null; Collection<File> filesOfDocument = null;
if (Boolean.TRUE == files) { if (Boolean.TRUE == files) {
// Find files matching the document // Find files matching the document
filesOfDocument = CollectionUtils.select(filesList, file -> file.getDocumentId().equals(documentDto.getId())); filesOfDocument = CollectionUtils.select(filesList, file -> file.getDocumentId().equals(documentDto.getId()));
filesCount = filesOfDocument.size(); filesCount = (long) filesOfDocument.size();
} else { } else {
filesCount = filesCountByDocument.get(documentDto.getId()); filesCount = filesCountByDocument.getOrDefault(documentDto.getId(), 0L);
} }
JsonObjectBuilder documentObjectBuilder = Json.createObjectBuilder() JsonObjectBuilder documentObjectBuilder = Json.createObjectBuilder()

15
docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java
View File

@ -4,13 +4,6 @@ import com.google.common.io.ByteStreams;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import com.sismics.docs.core.util.DirectoryUtil; import com.sismics.docs.core.util.DirectoryUtil;
import com.sismics.util.filter.TokenBasedSecurityFilter; import com.sismics.util.filter.TokenBasedSecurityFilter;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
import org.joda.time.format.DateTimeFormat;
import org.junit.Assert;
import org.junit.Test;
import jakarta.json.JsonArray; import jakarta.json.JsonArray;
import jakarta.json.JsonObject; import jakarta.json.JsonObject;
import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Entity;
@ -18,6 +11,13 @@ import jakarta.ws.rs.core.Form;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.Response.Status;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
import org.joda.time.format.DateTimeFormat;
import org.junit.Assert;
import org.junit.Test;
import java.io.InputStream; import java.io.InputStream;
import java.util.Date; import java.util.Date;
@ -261,6 +261,7 @@ public class TestDocumentResource extends BaseJerseyTest {
Assert.assertEquals(create1Date, json.getJsonNumber("create_date").longValue()); Assert.assertEquals(create1Date, json.getJsonNumber("create_date").longValue());
Assert.assertNotNull(json.get("update_date")); Assert.assertNotNull(json.get("update_date"));
tags = json.getJsonArray("tags"); tags = json.getJsonArray("tags");
Assert.assertEquals(1, json.getJsonNumber("file_count").intValue());
Assert.assertEquals(2, tags.size()); Assert.assertEquals(2, tags.size());
Assert.assertEquals(tag2Id, tags.getJsonObject(0).getString("id")); Assert.assertEquals(tag2Id, tags.getJsonObject(0).getString("id"));
Assert.assertEquals(tag1Id, tags.getJsonObject(1).getString("id")); Assert.assertEquals(tag1Id, tags.getJsonObject(1).getString("id"));