description OR genre -> description AND genre (#41)

remove just.for.showcasing.attributeNesting attribute

Author: finkmanAtSap

ams-cap-nodejs-bookshop/ams/dcl/cap/basePolicies.dcl

@@ -1,9 +1,13 @@
 POLICY "Reader" {
-    ASSIGN ROLE "Reader" WHERE (description IS NOT RESTRICTED OR genre IS NOT RESTRICTED) AND stock IS NOT RESTRICTED;
+    ASSIGN ROLE "Reader" WHERE
+        genre           IS NOT RESTRICTED   AND
+        description     IS NOT RESTRICTED   AND
+        stock           IS NOT RESTRICTED;
 }
 
 POLICY Inquisitor {
-    ASSIGN ROLE "Inquisitor" WHERE description IS NOT RESTRICTED;
+    ASSIGN ROLE "Inquisitor" WHERE 
+        description     IS NOT RESTRICTED;
 }
 
 POLICY "admin" {

ams-cap-nodejs-bookshop/ams/dcl/internal/apiPolicies.dcl

@@ -3,5 +3,8 @@ INTERNAL Policy AMS_ValueHelp {
 }
 
 INTERNAL Policy ReadCatalog {
-    USE cap.Reader RESTRICT stock < 30, description IS NOT RESTRICTED, genre IS NOT RESTRICTED;
+    USE cap.Reader RESTRICT 
+        genre           IS NOT RESTRICTED,
+        description     IS NOT RESTRICTED,
+        stock           < 30;
 }

ams-cap-nodejs-bookshop/ams/dcl/local/adminPolicies.dcl

@@ -1,13 +1,18 @@
 POLICY JuniorReader {
-    USE cap.Reader RESTRICT description LIKE '%happy%ending%', genre IN ('Fantasy', 'Fairy Tale'),
-                            stock IS NOT RESTRICTED;
+    USE cap.Reader RESTRICT 
+        genre           IN ('Fantasy', 'Fairy Tale', 'Mystery'),
+        description     IS NOT RESTRICTED,
+        stock           IS NOT RESTRICTED;
 }
 
 POLICY BestsellerReader {
-    USE cap.Reader RESTRICT stock < 20,
-                            description IS NOT RESTRICTED, genre IS NOT RESTRICTED;
+    USE cap.Reader RESTRICT 
+        genre           IS NOT RESTRICTED,
+        description     IS NOT RESTRICTED,
+        stock           < 20;
 }
 
 POLICY Zealot {
-    USE cap.Inquisitor RESTRICT description LIKE '%religious%references%';
+    USE cap.Inquisitor RESTRICT 
+        description     LIKE '%religious%references%';
 }

ams-cap-nodejs-bookshop/ams/dcl/schema.dcl

@@ -1,22 +1,15 @@
 // ---------------------------------HEADER_START-----------------------------------------------
-// Generated from a CAP model by the SAP AMS Plugin (@sap/ams) 2.0.0
-// hash of generated content: 8537b8096e1fb048199d1f1559d5eefc36a8df54921c560050a413d40c07688b
+// Generated from a CAP model by the SAP AMS Plugin (@sap/ams) 3.3.0
+// hash of generated content: 760f88aa8521b7b516c368a517af58f0a55f37dfd0be60eb07c5d94cc2ea3efe
 // ----------------------------------HEADER_END------------------------------------------------
 
 SCHEMA {
-	description: String,
 	@valueHelp: { 
 		path: 'Genres',
 		valueField: 'name',
 		labelField: 'name'
 	}
 	genre: String,
-	just: {
-		for: {
-			showcasing: {
-				attributeNesting: Number
-			}
-		}
-	},
+	description: String,
 	stock: Number
 }

ams-cap-nodejs-bookshop/srv/admin-service.cds

@@ -1,14 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service AdminService @(requires:'admin', path: '/admin') {
   entity Books as projection on my.Books;
-  @ams.attributes: {
-    just: {
-      for: {
-        showcasing: {
-          attributeNesting: (ID)
-        }
-      }
-    }
-  }
   entity Authors as projection on my.Authors;
 }

ams-cap-nodejs-bookshop/test/cat-service.test.js

@@ -85,26 +85,17 @@ describe('CatalogService', () => {
     })
 
     /**
-     * The JuniorReader policy adds attribute filters with an OR condition to the query:
-     * - access to Eleonora is granted as its description hints at a happy ending
+     * The JuniorReader policy adds attribute filters for genre to the query:
      * - access to Catweazle is granted as its genre is Fantasy
+     * - access to The Raven, Eleonora is granted as their genre is Mystery
      */
-    it('/Books should return 2 Books (Eleonora, Catweazle)', async () => {
+    it('/Books should return 3 Books (Catweazle, The Raven, Eleonora)', async () => {
       const { status, data } = await GET`/odata/v4/catalog/Books`
       expect(status).toBe(200)
-      expect(data.value?.length).toBe(2)
-      expect(data.value).toContainEqual(expect.objectContaining({ title: 'Eleonora' }))
-      expect(data.value).toContainEqual(expect.objectContaining({ title: 'Catweazle' }))
-    })
-
-    /**
-     * On /ListOfBooks, the AMS description attribute is not mapped to a cds element, so access to Eleonora is forbidden
-     */
-    it('/ListOfBooks should return 1 Book (Catweazle)', async () => {
-      const { status, data } = await GET`/odata/v4/catalog/ListOfBooks`
-      expect(status).toBe(200)
-      expect(data.value?.length).toBe(1)
+      expect(data.value?.length).toBe(3)
       expect(data.value).toContainEqual(expect.objectContaining({ title: 'Catweazle' }))
+      expect(data.value).toContainEqual(expect.objectContaining({ title: 'The Raven' }))
+      expect(data.value).toContainEqual(expect.objectContaining({ title: 'Eleonora' }))
     })
 
     // Book 201 = Wuthering Heights
@@ -115,11 +106,11 @@ describe('CatalogService', () => {
       })
     })
 
-    // Book 252 = Eleonora
-    it('/Books/252/getStockedValue() should return 7770', async () => {
-      const { status, data } = await GET`/odata/v4/catalog/Books/252/getStockedValue()`
+    // Book 271 = Catweazle
+    it('/Books/271/getStockedValue() should return 3300', async () => {
+      const { status, data } = await GET`/odata/v4/catalog/Books/271/getStockedValue()`
       expect(status).toBe(200)
-      expect(data.value).toBe(7770)
+      expect(data.value).toBe(3300)
     })
 
     // 15711.35 = stocked value over ALL books because instance-based filters are NOT supported by CAP for functions bound to more than one entity
@@ -196,7 +187,7 @@ describe('CatalogService', () => {
     /**
      * The ReadCatalog API policy grants access to books with stock < 30
      */
-    it('/Books should return 2 Books (Eleonora, Catweazle)', async () => {
+    it('/Books should return 3 Books with stock < 30 (Catweazle, Wuthering Heights, Jane Eyre)', async () => {
       const { status, data } = await GET`/odata/v4/catalog/Books`
       expect(status).toBe(200)
       expect(data.value?.length).toBe(3)
@@ -227,9 +218,9 @@ describe('CatalogService', () => {
     })
 
     /**
-     * The JuniorReader policy adds attribute filters with an OR condition to the query:
+     * The JuniorReader policy adds attribute filters for genre to the query:
      * - access to Catweazle is granted as its genre is Fantasy
-     * - access to Eleonora is granted as its description hints at a happy ending but filtered out by stock < 30 from ReadCatalog policy
+     * - access to The Raven and Eleonora is granted as their genre is Mystery but filtered out by stock < 30 from ReadCatalog policy
      */
     it('/Books should return 1 Book (Catweazle)', async () => {
       const { status, data } = await GET`/odata/v4/catalog/Books`