Added Filename field to Item

Signed-off-by: Rob Tjalma <[email protected]>

Author: Rob Tjalma

app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceTest.java

@@ -37,9 +37,11 @@ class CompasSclDataResourceTest {
     void list_WhenCalled_ThenItemResponseRetrieved() {
         var type = SclType.SCD;
         var uuid = UUID.randomUUID();
+        var filename = "Filename";
         var version = "1.0.0";
 
-        when(compasSclDataService.list(type)).thenReturn(Collections.singletonList(new Item(uuid.toString(), version)));
+        when(compasSclDataService.list(type))
+                .thenReturn(Collections.singletonList(new Item(uuid.toString(), filename, version)));
 
         var response = given()
                 .pathParam(TYPE_PATH_PARAM, type)
@@ -51,6 +53,7 @@ void list_WhenCalled_ThenItemResponseRetrieved() {
 
         var xmlPath = response.xmlPath();
         assertEquals(uuid.toString(), xmlPath.get("ListResponse.Item[0].Id"));
+        assertEquals(filename, xmlPath.get("ListResponse.Item[0].Filename"));
         assertEquals(version, xmlPath.get("ListResponse.Item[0].Version"));
         verify(compasSclDataService, times(1)).list(type);
     }
@@ -59,9 +62,11 @@ void list_WhenCalled_ThenItemResponseRetrieved() {
     void listVersionsByUUID_WhenCalled_ThenItemResponseRetrieved() {
         var type = SclType.SCD;
         var uuid = UUID.randomUUID();
+        var filename = "Filename";
         var version = "1.0.0";
 
-        when(compasSclDataService.listVersionsByUUID(type, uuid)).thenReturn(Collections.singletonList(new Item(uuid.toString(), version)));
+        when(compasSclDataService.listVersionsByUUID(type, uuid))
+                .thenReturn(Collections.singletonList(new Item(uuid.toString(), filename, version)));
 
         var response = given()
                 .pathParam(TYPE_PATH_PARAM, type)
@@ -74,6 +79,7 @@ void listVersionsByUUID_WhenCalled_ThenItemResponseRetrieved() {
 
         var xmlPath = response.xmlPath();
         assertEquals(uuid.toString(), xmlPath.get("ListResponse.Item[0].Id"));
+        assertEquals(filename, xmlPath.get("ListResponse.Item[0].Filename"));
         assertEquals(version, xmlPath.get("ListResponse.Item[0].Version"));
         verify(compasSclDataService, times(1)).listVersionsByUUID(type, uuid);
     }

repository/src/main/java/org/lfenergy/compas/scl/data/model/Item.java

@@ -16,6 +16,11 @@ public class Item {
             required = true
     )
     private String id;
+    @XmlElement(
+            name = "Filename",
+            required = true
+    )
+    private String filename;
     @XmlElement(
             name = "Version",
             required = true
@@ -25,8 +30,9 @@ public class Item {
     public Item() {
     }
 
-    public Item(String id, String version) {
+    public Item(String id, String filename, String version) {
         this.id = id;
+        this.filename = filename;
         this.version = version;
     }
 
@@ -38,6 +44,14 @@ public void setId(String id) {
         this.id = id;
     }
 
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+
     public String getVersion() {
         return version;
     }

repository/src/test/java/org/lfenergy/compas/scl/data/model/ItemTest.java

@@ -18,11 +18,13 @@ protected Class<?> getClassToBeTested() {
     @Test
     void constructor_WhenCalledWithParameters_ThenValuesAreFilled() {
         var id = UUID.randomUUID().toString();
+        var filename = "Filename";
         var version = "1.0.0";
 
-        var item = new Item(id, version);
+        var item = new Item(id, filename, version);
 
         assertEquals(id, item.getId());
+        assertEquals(filename, item.getFilename());
         assertEquals(version, item.getVersion());
     }
 }

repository/src/test/java/org/lfenergy/compas/scl/data/util/JaxbMarshallerTest.java

@@ -15,14 +15,16 @@ class JaxbMarshallerTest {
     @Test
     void unmarshal_WhenItemXMLPassed_ThenItemObjectReturned() throws JAXBException {
         var id = "ID";
+        var filename = "FILENAME";
         var version = "VERSION";
-        var xml = "<Item><Id>" + id + "</Id><Version>" + version + "</Version></Item>";
+        var xml = "<Item><Id>" + id + "</Id><Filename>" + filename + "</Filename><Version>" + version + "</Version></Item>";
 
         JaxbMarshaller marshaller = new JaxbMarshaller();
         Item item = marshaller.unmarshal(xml);
 
         assertNotNull(item);
         assertEquals(id, item.getId());
+        assertEquals(filename, item.getFilename());
         assertEquals(version, item.getVersion());
     }
 }