fix: draft enabled & composite keys (#37)

* do not search by isactiveentity

* rm localization from data model

* fix: draft enabled entities

* test: composite keys entity

* tests: refactor and add new ones

Author: SirSimon04

package.json

@@ -68,7 +68,7 @@
     }
   },
   "scripts": {
-    "test": "npx jest",
+    "test": "npx jest --silent",
     "lint": "npx eslint --fix . --no-cache",
     "in-cap-dev": "cd node_modules && rm -fr @sap/cds* @cap-js/db-service @cap-js/sqlite",
     "prettier": "npx -y prettier@3 --write .",

srv/service.js

@@ -31,6 +31,7 @@ class PrintService extends cds.Service {
 
       for (let i = 0; i < keyFields.length; i++) {
         const keyField = keyFields[i];
+        if (keyField === "IsActiveEntity") continue; // select with IsActiveEntity is not supported
         const keyFilterIndex = req.query?.SELECT?.where?.findIndex(
           (item) =>
             typeof item === "object" &&
@@ -42,7 +43,7 @@ class PrintService extends cds.Service {
         keys[keyField] = keyValue;
 
         if (req.query?.SELECT?.where && req.query.SELECT.where.length === 3) {
-          delete req.query.SELECT.where;
+          req.query.SELECT.where = undefined;
         } else {
           req.query.SELECT.where.splice(keyFilterIndex, 4);
         }

test/bookshop/db/data/sap.capire.bookshop-Books_texts.csv

@@ -95,5 +95,17 @@ module.exports = async function () {
         }),
     ];
   });
+
+  insertPromises.push(
+    INSERT.into("CompositeKeys").entries({
+      ID: 1,
+      ID2: 2,
+      file: templatePDF,
+      fileName: `Book_Composite_Summary.pdf`,
+      file2: templatePDF,
+      fileName2: `Book_Composite_Summary_2.pdf`,
+    }),
+  );
+
   await Promise.all(insertPromises);
 };

test/bookshop/db/data/sap.capire.bookshop-Bookss.csv

@@ -14,8 +14,8 @@ entity Books : managed, BooksWithOneFile {
 
 entity BooksWithOneFile {
   key ID   : Integer;
-  title    : localized String(111)  @mandatory;
-  descr    : localized String(1111);
+  title    : String(111)  @mandatory;
+  descr    : String(1111);
   author   : Association to Authors @mandatory;
   genre    : Association to Genres;
   stock    : Integer;
@@ -48,3 +48,21 @@ entity Genres : sap.common.CodeList {
       children : Composition of many Genres
                    on children.parent = $self;
 }
+
+entity CompositeKeys : managed {
+  key ID : Integer;
+  key ID2 : Integer;
+
+  @Common.Label: '{i18n>Summary}'
+  @Core.MediaType: 'application/pdf'
+  @Core.ContentDisposition: fileName
+  file : LargeBinary;
+  @Common.Label: '{i18n>Summary}'
+  fileName : String  @readonly;
+  @Common.Label: '{i18n>Summary2} '
+  @Core.MediaType: 'application/pdf'
+  @Core.ContentDisposition: fileName2
+  file2 : LargeBinary ;
+  @Common.Label: '{i18n>Summary2} '
+  fileName2 : String  @readonly;
+}

test/bookshop/db/init.js

@@ -1,6 +1,7 @@
 using {sap.capire.bookshop as my} from '../db/schema';
 
 service AdminService @(requires: 'admin') {
+  @PDF.Printable
   entity Books   as projection on my.Books;
   entity Authors as projection on my.Authors;
 }

test/bookshop/db/schema.cds

@@ -68,4 +68,8 @@ service CatalogService {
     quantity : Integer;
     buyer    : String
   };
+
+  @odata.draft.enabled
+  @PDF.Printable
+  entity CompositeKeys    as projection on my.CompositeKeys;
 }