Merge pull request #68 from logion-network/feature/submitter-api

feat: API update for file/metadata submitter .
logion-network · Jan 10, 2022 · 98b7a3e · 98b7a3e
2 parents 149f1c8 + c96d2bb
commit 98b7a3e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/resources/schemas.json b/resources/schemas.json
@@ -596,6 +596,10 @@
                                     "type": "string",
                                     "format": "date-time",
                                     "description": "The date-time of addition (chain time)"
+                                },
+                                "submitter": {
+                                    "type": "string",
+                                    "description": "The SS58 address of the file submitter"
                                 }
                             }
                         }
@@ -644,6 +648,10 @@
                                     "type": "string",
                                     "format": "date-time",
                                     "description": "The date-time of addition (chain time)"
+                                },
+                                "submitter": {
+                                    "type": "string",
+                                    "description": "The SS58 address of the metadata item submitter"
                                 }
                             }
                         }
@@ -716,6 +724,10 @@
                                     "type": "string",
                                     "format": "date-time",
                                     "description": "The date-time of addition (chain time)"
+                                },
+                                "submitter": {
+                                    "type": "string",
+                                    "description": "The SS58 address of the file submitter"
                                 }
                             }
                         }
@@ -764,6 +776,10 @@
                                     "type": "string",
                                     "format": "date-time",
                                     "description": "The date-time of addition (chain time)"
+                                },
+                                "submitter": {
+                                    "type": "string",
+                                    "description": "The SS58 address of the metadata item submitter"
                                 }
                             }
                         }
@@ -848,6 +864,10 @@
                     "nature": {
                         "type": "string",
                         "description": "The file's nature"
+                    },
+                    "submitter": {
+                        "type": "string",
+                        "description": "The SS58 address of the file submitter"
                     }
                 }
             },
@@ -885,6 +905,10 @@
                     "value": {
                         "type": "string",
                         "description": "The item's value"
+                    },
+                    "submitter": {
+                        "type": "string",
+                        "description": "The SS58 address of the metadata item submitter"
                     }
                 }
             },

diff --git a/src/logion/controllers/locrequest.controller.ts b/src/logion/controllers/locrequest.controller.ts
@@ -166,11 +166,13 @@ export class LocRequestController extends ApiController {
                 hash: file.hash,
                 nature: file.nature,
                 addedOn: file.addedOn?.toISOString() || undefined,
+                submitter: locDescription.ownerAddress // TODO Change me
             })),
             metadata: request.getMetadataItems().map(item => ({
                 name: item.name,
                 value: item.value,
                 addedOn: item.addedOn?.toISOString() || undefined,
+                submitter: locDescription.ownerAddress // TODO Change me
             })),
             links: request.getLinks().map(link => ({
                 target: link.target,
@@ -313,11 +315,13 @@ export class LocRequestController extends ApiController {
                 hash: file.hash,
                 nature: file.nature,
                 addedOn: file.addedOn?.toISOString() || undefined,
+                submitter: locDescription.ownerAddress // TODO Change me
             })),
             metadata: request.getMetadataItems(false).map(item => ({
                 name: item.name,
                 value: item.value,
-                addedOn: item.addedOn?.toISOString() || undefined
+                addedOn: item.addedOn?.toISOString() || undefined,
+                submitter: locDescription.ownerAddress // TODO Change me
             })),
             links: request.getLinks(false).map(link => ({
                 target: link.target,

diff --git a/test/unit/controllers/locrequest.controller.spec.ts b/test/unit/controllers/locrequest.controller.spec.ts
@@ -27,6 +27,7 @@ const testUserIdentity = {
 }
 
 const IDENTITY_LOC_ID = "6b00b9f2-4439-4c4a-843e-2ea3ce2016fd";
+const SUBMITTER = "5DDGQertEH5qvKVXUmpT3KNGViCX582Qa2WWb8nGbkmkRHvw";
 
 const identityInIdentityLoc = {
     firstName: "Felix",
@@ -306,7 +307,7 @@ describe('LocRequestController', () => {
         const buffer = Buffer.from(SOME_DATA);
         await request(app)
             .post(`/api/loc-request/${ REQUEST_ID }/files`)
-            .field({ nature: "some nature" })
+            .field({ nature: "some nature", submitter: SUBMITTER })
             .attach('file', buffer, {
                 filename: FILE_NAME,
                 contentType: 'text/plain',
@@ -351,6 +352,7 @@ describe('LocRequestController', () => {
                 expect(file.nature).toBe(testFile.nature)
                 expect(file.hash).toBe(testFile.hash)
                 expect(file.addedOn).toBe(testFile.addedOn?.toISOString())
+                expect(file.submitter).toBe(ALICE) // TODO Change me
                 const link = response.body.links[0]
                 expect(link.nature).toBe(testLink.nature)
                 expect(link.target).toBe(testLink.target)
@@ -359,6 +361,7 @@ describe('LocRequestController', () => {
                 expect(metadataItem.name).toBe(testMetadataItem.name)
                 expect(metadataItem.value).toBe(testMetadataItem.value)
                 expect(metadataItem.addedOn).toBe(testMetadataItem.addedOn?.toISOString())
+                expect(metadataItem.submitter).toBe(ALICE) // TODO Change me
             });
     });
 
@@ -381,7 +384,7 @@ describe('LocRequestController', () => {
         const app = setupApp(LocRequestController, (container) => mockModelForAllItems(container, locRequest))
         await request(app)
             .post(`/api/loc-request/${ REQUEST_ID }/metadata`)
-            .send({ name: SOME_DATA_NAME, value: SOME_DATA_VALUE })
+            .send({ name: SOME_DATA_NAME, value: SOME_DATA_VALUE, submitter: SUBMITTER })
             .expect(204)
         locRequest.verify(instance => instance.addMetadataItem(
             It.Is<MetadataItemDescription>(item => item.name == SOME_DATA_NAME && item.value == SOME_DATA_VALUE)))
@@ -682,6 +685,7 @@ const SOME_FILE = {
     hash: SOME_DATA_HASH,
     oid: SOME_OID,
     nature: "file-nature",
+    submitter: SUBMITTER
 };
 
 async function fileExists(filePath: string): Promise<boolean> {