Merge branch 'singleAttachment' of https://github.com/cap-js/attachments into singleAttachment

Author: KoblerS

db/index.cds

@@ -12,13 +12,13 @@ using {
 context sap.attachments {
 
   type SingleMediaData @(_is_media_data) {
-    url       : String                                    @UI.Hidden;
-    content   : LargeBinary                               @title: '{i18n>Attachment}'; // only for db-based services
-    mimeType  : String default 'application/octet-stream' @title: '{i18n>MediaType}';
-    filename  : String                                    @title: '{i18n>FileName}';
-    hash      : String                                    @UI.Hidden                   @Core.Computed;
-    status    : Association to one ScanStates default 'Unscanned'                @title: '{i18n>ScanStatus}'  @Common.Text: status.name  @Common.TextArrangement: #TextOnly;
-    lastScan  : Timestamp                                 @title: '{i18n>LastScan}'    @Core.Computed;
+    url       : String                                            @UI.Hidden;
+    content   : LargeBinary                                       @title: '{i18n>Attachment}'; // only for db-based services
+    mimeType  : String default 'application/octet-stream'         @title: '{i18n>MediaType}';
+    filename  : String                                            @title: '{i18n>FileName}';
+    hash      : String                                            @UI.Hidden                   @Core.Computed;
+    status    : Association to one ScanStates default 'Unscanned' @title: '{i18n>ScanStatus}'  @Common.Text: status.name  @Common.TextArrangement: #TextOnly;
+    lastScan  : Timestamp                                         @title: '{i18n>LastScan}'    @Core.Computed;
   }
 
   aspect MediaData @(_is_media_data) {

tests/incidents-app/db/data/sap.capire.incidents-SingleAttachment.csv

@@ -0,0 +1,3 @@
+ID,name
+a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d,My single attachment
+b2c3d4e5-f6a7-4b8c-9d0e-1f2a3b4c5d6e,My other attachment

tests/integration/attachments.test.js

@@ -1304,24 +1304,25 @@ describe("Tests for single attachment entity", () => {
     const filepath = join(__dirname, "content/sample.pdf")
     const fileContent = readFileSync(filepath)
 
-    const postRes = await POST(
+    const putRes = await PUT(
       `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=false)/myAttachment`,
       {
-        filename: basename(filepath),
-        mimeType: "application/pdf",
+          filename: basename(filepath),
+          mimeType: "application/pdf",
       },
     )
+    expect(putRes.status).toEqual(200)
 
-    const putRes = await PUT(
-      `/odata/v4/processor/SingleAttachment_myAttachment(up__ID=${singleAttachment.ID},ID=${postRes.data.ID},IsActiveEntity=false)/content`,
+    const putContentRes = await PUT(
+      `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=false)/myAttachment/content`,
       fileContent,
       {
         headers: {
           "Content-Type": "application/pdf",
         },
       },
     )
-    expect(putRes.status).toEqual(204)
+    expect(putContentRes.status).toEqual(204)
 
     // Activate the draft
     await POST(
@@ -1332,7 +1333,7 @@ describe("Tests for single attachment entity", () => {
     const getRes = await GET(
       `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=true)/myAttachment`,
     )
-    expect(getRes.data.ID).toBeDefined()
+    expect(getRes.data.filename).toBe(basename(filepath))
   })
 
   it("should delete a SingleAttachment and its attachment", async () => {
@@ -1345,15 +1346,21 @@ describe("Tests for single attachment entity", () => {
     )
     const filepath = join(__dirname, "content/sample.pdf")
     const fileContent = readFileSync(filepath)
-    const postRes = await POST(
+    
+    await PUT(
       `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=false)/myAttachment`,
-      { filename: basename(filepath) },
+      { 
+        filename: basename(filepath),
+        mimeType: "application/pdf",
+      },
     )
+
     await PUT(
-      `/odata/v4/processor/SingleAttachment_myAttachment(up__ID=${singleAttachment.ID},ID=${postRes.data.ID},IsActiveEntity=false)/content`,
+      `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=false)/myAttachment/content`,
       fileContent,
       { headers: { "Content-Type": "application/pdf" } },
     )
+
     await POST(
       `/odata/v4/processor/SingleAttachment(ID=${singleAttachment.ID},IsActiveEntity=false)/ProcessorService.draftActivate`,
     )
@@ -1376,7 +1383,6 @@ describe("Tests for single attachment entity", () => {
       SELECT.one
         .from("sap.attachments.Attachments")
         .where({ url: attachmentUrl })
-        .columns("content"),
     )
     expect(content.content).toBeNull()
   })