Merge branch 'main' into new-capire

Bumps the production-dependencies group with 2 updates in the / directory: [@sap/cds](https://cap.cloud.sap/) and [@cap-js-community/odata-v2-adapter](https://github.com/cap-js-community/odata-v2-adapter).


Updates `@sap/cds` from 8.4.0 to 8.5.0

Updates `@cap-js-community/odata-v2-adapter` from 1.13.7 to 1.13.8
- [Release notes](https://github.com/cap-js-community/odata-v2-adapter/releases)
- [Changelog](https://github.com/cap-js-community/odata-v2-adapter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cap-js-community/odata-v2-adapter/compare/v1.13.7...v1.13.8)

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@cap-js-community/odata-v2-adapter"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/node.js.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 18.x]
+        node-version: [22.x, 20.x, 18.x]
 
     steps:
     - uses: actions/checkout@v4
@@ -33,6 +33,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
     - run: npm ci
     - run: npm run lint

README.md

@@ -13,7 +13,7 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Preliminaries
 
-1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/jumpstart))
 2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
    ```sh
@@ -36,7 +36,7 @@ cd samples
 In the samples folder run:
 
 ```sh
-npm install
+npm ci
 ```
 
 ### Run

bookshop/app/vue/app.js

@@ -19,13 +19,13 @@ const books = Vue.createApp ({
         search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
 
         async fetch (etc='') {
-            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
+            const {data} = await GET(`/Books?${etc}`)
             books.list = data.value
         },
 
         async inspect (eve) {
             const book = books.book = books.list [eve.currentTarget.rowIndex-1]
-            const res = await GET(`/Books/${book.ID}?$select=descr,stock,image`)
+            const res = await GET(`/Book/${book.ID}?$select=descr,stock,image`)
             Object.assign (book, res.data)
             books.order = { quantity:1 }
             setTimeout (()=> $('form > input').focus(), 111)

bookshop/app/vue/index.html

@@ -45,11 +45,11 @@
         <tr v-for="book in list" v-bind:id="book.ID" v-on:click="inspect">
             <td>{{ book.title }}</td>
             <td>{{ book.author }}</td>
-            <td>{{ book.genre.name }}</td>
+            <td>{{ book.genre }}</td>
             <td class="rating-stars">
                 {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
             </td>
-            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
+            <td>{{ book.currency }} {{ book.price }}</td>
         </tr>
     </table>
 

bookshop/srv/admin-service.cds

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

bookshop/srv/cat-service.cds

@@ -2,15 +2,20 @@ using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
 
   /** For displaying lists of Books */
-  @readonly entity ListOfBooks as projection on Books
+  @readonly entity Books as projection on Book excluding { descr };
-  excluding { descr };
 
   /** For display in details pages */
-  @readonly entity Books as projection on my.Books { *,
+  @readonly entity Book as projection on my.Books { *,
-    author.name as author
+    currency.name as currencyName, // flattened
-  } excluding { createdBy, modifiedBy };
+    currency.symbol as currency,  // flattened
+    author.name as author,       // flattened
+    genre.name as genre,        // flattened
+  } excluding {
+    createdBy, modifiedBy, // as end users shouldn't see them
+    localized, texts,     // as end users don't need them
+  };
 
   @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  action submitOrder ( book: Book:ID, quantity: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+  event OrderedBook : { book: Book:ID; quantity: Integer; buyer: String };
 }

bookshop/srv/cat-service.js

@@ -3,10 +3,10 @@ const cds = require('@sap/cds')
 class CatalogService extends cds.ApplicationService { init() {
 
   const { Books } = cds.entities('sap.capire.bookshop')
-  const { ListOfBooks } = this.entities
+  const { Books:Book } = this.entities
 
   // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
+  this.after('each', Book, book => {
     if (book.stock > 111) book.title += ` -- 11% discount!`
   })
 

bookshop/test/requests.http

@@ -1,5 +1,6 @@
 @server = http://localhost:4004
 @me = Authorization: Basic {{$processEnv USER}}:
+@alice = Authorization: Basic alice:
 
 
 ### ------------------------------------------------------------------------
@@ -16,11 +17,11 @@ GET {{server}}/browse/$metadata
 
 ### ------------------------------------------------------------------------
 # Browse Books as any user
-GET {{server}}/browse/ListOfBooks?
+GET {{server}}/admin/Books?
   # &$select=title,stock
   &$expand=genre
   # &sap-language=de
-{{me}}
+{{alice}}
 
 
 ### ------------------------------------------------------------------------
@@ -30,13 +31,13 @@ GET {{server}}/admin/Authors?
   # &$expand=books($select=title;$expand=currency)
   # &$filter=ID eq 101
   # &sap-language=de
-Authorization: Basic alice:
+{{alice}}
 
 ### ------------------------------------------------------------------------
 # Create Author
 POST {{server}}/admin/Authors
 Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:
+{{alice}}
 
 {
   "ID": 112,
@@ -49,7 +50,7 @@ Authorization: Basic alice:
 # Create book
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:
+{{alice}}
 
 {
   "ID": 2,
@@ -67,7 +68,7 @@ Authorization: Basic alice:
 # Put image to books
 PUT {{server}}/admin/Books(2)/image
 Content-Type: image/png
-Authorization: Basic alice:
+{{alice}}
 
 data:image/png;base64,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
 

bookstore/_i18n/i18n_de.properties

@@ -0,0 +1,12 @@
+Books = Bücher
+Book = Buch
+Title = Titel
+Description = Beschreibung
+Stock = Bestand
+Image = Bild
+Price = Preis
+Currency = Währung
+
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors

bookstore/_i18n/i18n_en.properties

@@ -0,0 +1,21 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Description = Description
+Stock = Stock
+Image = Image
+Price = Price
+Currency = Currency
+
+Authors = Authors
+Author = Author
+AuthorID = Author''s ID
+Name = Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+
+Genres = Genres
+Genre = Genre

bookstore/_i18n/i18n_fr.properties

@@ -0,0 +1,20 @@
+Books = Livres
+Book = Livre
+Title = Titre
+Description = Description
+Stock = Action
+Image = Image
+Price = Prix
+Currency = Devise
+
+Authors = Auteurs
+Author = Auteur
+AuthorID = ID de l''auteur
+Name = Nom
+DateOfBirth = Date de naissance
+DateOfDeath = Date de décès
+PlaceOfBirth = Lieu de naissance
+PlaceOfDeath = Lieu de décès
+
+Genres = Genre
+Genre = Genre

bookstore/_i18n/messages_de.properties

@@ -0,0 +1,34 @@
+400 = Ungültige Anfrage
+401 = Nicht autorisiert
+403 = Verboten
+404 = Nicht gefunden
+405 = Methode nicht zulässig
+406 = Nicht akzeptabel
+407 = Proxy-Authentifizierung erforderlich
+408 = Anfrage-Timeout
+409 = Konflikt
+410 = Weg
+411 = Erforderliche Länge
+412 = Vorbedingung fehlgeschlagen
+413 = Nutzlast zu groß
+414 = URI zu lang
+415 = Nicht unterstützter Medientyp
+416 = Bereich nicht erfüllbar
+417 = Erwartung fehlgeschlagen
+422 = Nicht verarbeitbarer Inhalt
+424 = Fehlgeschlagene Abhängigkeit
+428 = Vorbedingung erforderlich
+429 = Zu viele Anfragen
+431 = Anfrage-Headerfelder zu groß
+451 = Aus rechtlichen Gründen nicht verfügbar
+500 = Interner Serverfehler
+501 = Der Server unterstützt die zur Erfüllung der Anfrage erforderliche Funktionalität nicht
+502 = Ungültiges Gateway
+503 = Dienst nicht verfügbar
+504 = Gateway-Timeout
+
+ASSERT_RANGE = Wert {0} liegt nicht im angegebenen Bereich [{1}, {2}]
+ASSERT_FORMAT = Wert "{0}" liegt nicht im angegebenen Format "{1}"
+ASSERT_ARRAY = Wert muss ein Array sein
+ASSERT_ENUM = Wert {0} ist gemäß Enumerationsdeklaration {{1}} ungültig
+ASSERT_NOT_NULL = Wert ist erforderlich

bookstore/_i18n/messages_en.properties

@@ -0,0 +1,34 @@
+400 = Bad Request
+401 = Unauthorized
+403 = Forbidden
+404 = Not Found
+405 = Method Not Allowed
+406 = Not Acceptable
+407 = Proxy Authentication Required
+408 = Request Timeout
+409 = Conflict
+410 = Gone
+411 = Length Required
+412 = Precondition Failed
+413 = Payload Too Large
+414 = URI Too Long
+415 = Unsupported Media Type
+416 = Range Not Satisfiable
+417 = Expectation Failed
+422 = Unprocessable Content
+424 = Failed Dependency
+428 = Precondition Required
+429 = Too Many Requests
+431 = Request Header Fields Too Large
+451 = Unavailable For Legal Reasons
+500 = Internal Server Error
+501 = The server does not support the functionality required to fulfill the request
+502 = Bad Gateway
+503 = Service Unavailable
+504 = Gateway Timeout
+
+ASSERT_RANGE = Value {0} is not in specified range [{1}, {2}]
+ASSERT_FORMAT = Value "{0}" is not in specified format "{1}"
+ASSERT_ARRAY = Value must be an array
+ASSERT_ENUM = Value {0} is invalid according to enum declaration {{1}}
+ASSERT_NOT_NULL = Value is required

bookstore/_i18n/messages_fr.properties

@@ -0,0 +1,34 @@
+400 = Requête incorrecte
+401 = Non autorisée
+403 = Interdite
+404 = Introuvable
+405 = Méthode non autorisée
+406 = Non acceptable
+407 = Authentification proxy requise
+408 = Délai d''expiration de la requête
+409 = Conflit
+410 = Disparu
+411 = Longueur requise
+412 = Échec de la condition préalable
+413 = Charge utile trop importante
+414 = URI trop longue
+415 = Type de média non pris en charge
+416 = Plage non satisfaisante
+417 = Échec de l''attente
+422 = Contenu non traitable
+424 = Dépendance échouée
+428 = Condition préalable requise
+429 = Trop de requêtes
+431 = Champs d''en-tête de requête trop importants
+451 = Indisponible pour des raisons juridiques
+500 = Erreur interne du serveur
+501 = Le serveur ne prend pas en charge la fonctionnalité requise pour répondre à la requête
+502 = Passerelle incorrecte
+503 = Service indisponible
+504 = Délai d''attente de la passerelle
+
+ASSERT_RANGE = La valeur {0} n''est pas dans la plage spécifiée [{1}, {2}]
+ASSERT_FORMAT = La valeur "{0}" n''est pas au format spécifié "{1}"
+ASSERT_ARRAY = La valeur doit être un tableau
+ASSERT_ENUM = La valeur {0} n''est pas valide selon la déclaration d''énumération {{1}}
+ASSERT_NOT_NULL = La valeur est obligatoire

bookstore/server.js

@@ -5,10 +5,15 @@ cds.once('served', require('./srv/mashup'))
 
 // Add routes to UIs from imported packages
 cds.once('bootstrap',(app)=>{
+  try {
     app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
     app.serve ('/reviews') .from ('@capire/reviews','app/vue')
     app.serve ('/orders') .from('@capire/orders','app/orders')
     app.serve ('/data') .from('@capire/data-viewer','app/viewer')
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') throw new Error('Run "npm ci" to install the required dependencies', { cause: err })
+    throw err
+  }
 })
 
 // Add Swagger UI

common/cds-plugin.js

@@ -0,0 +1 @@
+// dummy to auto-load the plugin

common/package.json

@@ -4,5 +4,12 @@
   "version": "1.0.0",
   "dependencies": {
     "@sap/cds": "*"
+  },
+  "cds": {
+    "requires": {
+      "@capire/common/data": {
+        "model": "@capire/common"
+      }
+    }
   }
 }

data-viewer/srv/data-service.js

@@ -49,6 +49,7 @@ class DataService extends cds.ApplicationService { init(){
 
 module.exports = { DataService }
 
+/** @returns {cds.Service} */
 function findDataSource(dataSourceName, entityName) {
   for (let srv of Object.values(cds.services)) { // all connected services
     if (!srv.name)  continue // FIXME intermediate/pending in cds.services ?

fiori/app/_i18n/i18n.properties

@@ -1,43 +0,0 @@
-Books = Books
-Book = Book
-ID = ID
-Title = Title
-Author = Author
-AuthorID = Author ID
-Stock = Stock
-Name = Name
-Description = Description
-Image = Image
-AuthorName = Author's Name
-DateOfBirth = Date of Birth
-DateOfDeath = Date of Death
-PlaceOfBirth = Place of Birth
-PlaceOfDeath = Place of Death
-Age = Age
-Lifetime = Lifetime
-Authors = Authors
-
-Order = Order
-Orders = Orders
-OrderNo = Order Number
-OrderItems = Order Items
-Customer = Customer
-Product = Product
-ProductID = Product ID
-ProductTitle = Product Title
-UnitPrice = Unit Price
-Quantity = Quantity
-
-Price = Price
-Currency = Currency
-Date = Date
-Rating = Rating
-NumberOfReviews = Number of Reviews
-
-Genre = Genre
-Genres = Genres
-SubGenres = Sub Genres
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent

fiori/app/_i18n/i18n_de.properties

@@ -1,14 +1,5 @@
-Books = Bücher
-Book = Buch
-ID = ID
-Title = Titel
-Authors = Autoren
-Author = Autor
-AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
-Name = Name
+rder = Bestellung
-Stock = Bestand
-Order = Bestellung
 Orders = Bestellungen
 Price = Preis

fiori/app/_i18n/i18n_en.properties

@@ -0,0 +1,8 @@
+Age = Age
+Lifetime = Lifetime
+
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent

fiori/app/browse/fiori-service.cds

@@ -4,10 +4,10 @@ using CatalogService from '@capire/bookstore';
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI : {
+annotate CatalogService.Book with @(UI : {
     HeaderInfo        : {
-        TypeName       : 'Book',
+        TypeName       : '{i18n>Book}',
-        TypeNamePlural : 'Books',
+        TypeNamePlural : '{i18n>Books}',
         Description    : {Value : author}
     },
     HeaderFacets      : [{
@@ -24,7 +24,7 @@ annotate CatalogService.Books with @(UI : {
     FieldGroup #Price : {Data : [
         {Value : price},
         {
-            Value : currency.symbol,
+            Value : currencyName,
             Label : '{i18n>Currency}'
         },
     ]},
@@ -35,11 +35,11 @@ annotate CatalogService.Books with @(UI : {
 //
 //	Books List Page
 //
-annotate CatalogService.Books with @(UI : {
+annotate CatalogService.Book with @(UI : {
     SelectionFields : [
         ID,
         price,
-        currency_code
+        currencyName
     ],
     LineItem        : [
         {
@@ -50,8 +50,10 @@ annotate CatalogService.Books with @(UI : {
             Value : author,
             Label : '{i18n>Author}'
         },
-        {Value : genre.name},
+        {Value : genre},
         {Value : price},
-        {Value : currency.symbol},
+        {Value : currencyName},
     ]
-}, );
+}) {
+    currencyName @Common.Label : '{i18n>Currency}';
+};

fiori/app/common.cds

@@ -18,7 +18,6 @@ annotate my.Books with @(
       ID,
       author_ID,
       price,
-      currency_code
     ],
     LineItem        : [
       { Value: ID, Label: '{i18n>Title}' },
@@ -26,7 +25,6 @@ annotate my.Books with @(
       { Value: genre.name },
       { Value: stock },
       { Value: price },
-      { Value: currency.symbol },
     ]
   }
 ) {
@@ -63,7 +61,7 @@ annotate my.Books with {
   title  @title: '{i18n>Title}';
   genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
   author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
-  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency_code;
+  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency;
   stock  @title: '{i18n>Stock}';
   descr  @title: '{i18n>Description}'  @UI.MultiLineText;
   image  @title: '{i18n>Image}';

media/srv/media-service.cds

@@ -1,6 +1,7 @@
 using { sap.capire.media as db } from '../db/data-model';
 namespace sap.capire.media;
 
+@path: '/media-server'
 service MediaServer  {
     entity Media   as projection on db.Media ;
 }

media/srv/media-service.js

@@ -10,7 +10,7 @@ module.exports = srv => {
   })
 
   srv.on('UPDATE', 'Media', (req, next) => {
-    const url = req._.req.path
+    const url = req.path
     if (url.includes('content')) {
       const id = req.data.id
       const obj = mediaDB.get(id)
@@ -32,7 +32,7 @@ module.exports = srv => {
   })
 
   srv.on('READ', 'Media', (req, next) => {
-    const url = req._.req.path
+    const url = req.path
     if (url.includes('content')) {
       const id = req.data.id
       const mediaObj = mediaDB.get(id)

orders/_i18n/i18n_de.properties

@@ -0,0 +1,3 @@
+Order = Bestellung
+Orders = Bestellungen
+Price = Preis

orders/_i18n/i18n_en.properties

@@ -0,0 +1,10 @@
+Order = Order
+Orders = Orders
+OrderNo = Order Number
+OrderItems = Order Items
+Customer = Customer
+Product = Product
+ProductID = Product ID
+ProductTitle = Product Title
+UnitPrice = Unit Price
+Quantity = Quantity

orders/_i18n/i18n_fr.properties

@@ -0,0 +1,10 @@
+Order = Order
+Orders = Orders
+OrderNo = Numéro de commande
+OrderItems = Articles de la commande
+Customer = Client
+Product = Produit
+ProductID = ID du produit
+ProductTitle = Titre du produit
+UnitPrice = Prix unitaire
+Quantity = Quantité

orders/db/schema.cds

@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
-  OrderNo  : String(22) @title:'Order Number'; //> readable key
+  OrderNo  : String(44) @title:'Order Number'; //> readable key
   Items    : Composition of many {
     key ID    : UUID;
     product   : Association to Products;

package.json

@@ -20,6 +20,7 @@
         "./reviews"
     ],
     "devDependencies": {
+        "@cap-js/cds-types": "^0",
         "@cap-js/sqlite": "^1",
         "axios": "^1",
         "chai": "^4.3.4",
@@ -47,4 +48,4 @@
     },
     "license": "SEE LICENSE IN LICENSE",
     "private": true
-  }
+}

reviews/_i18n/i18n_de.properties

@@ -0,0 +1,3 @@
+Date = Datum
+Rating = Bewertung
+NumberOfReviews = Anzahl der Reviews

reviews/_i18n/i18n_en.properties

@@ -0,0 +1,5 @@
+Reviews = Reviews
+Review = Review
+Date = Date
+Rating = Rating
+NumberOfReviews = Number of Reviews

reviews/_i18n/i18n_fr.properties

@@ -0,0 +1,5 @@
+Reviews = Avis
+Review = Avis
+Date = Date
+Rating = Note
+NumberOfReviews = Nombre d''avis

test/consuming-actions.test.js

@@ -0,0 +1,53 @@
+const cds = require("@sap/cds");
+const { expect } = cds.test(
+  "serve",
+  "CatalogService",
+  "--from",
+  "@capire/bookshop,@capire/common",
+  "--in-memory"
+);
+
+describe("Consuming actions locally", () => {
+  let cats, CatalogService, Books, stockBefore;
+  const BOOK_ID = 251;
+  const QUANTITY = 1;
+
+  before("bootstrap the database", async () => {
+    CatalogService = cds.services.CatalogService;
+    expect(CatalogService).not.to.be.undefined;
+
+    Books = CatalogService.entities.Books;
+    expect(Books).not.to.be.undefined;
+
+    cats = await cds.connect.to("CatalogService");
+  });
+
+  beforeEach(async () => {
+    // Read the stock before the action is called
+    stockBefore = (await cats.get(Books, BOOK_ID)).stock;
+  });
+
+  it("calls unbound actions - basic variant using srv.send", async () => {
+    // Use a managed transaction to create a continuation with an authenticated user
+    const res1 = await cats.tx({ user: "alice" }, () => {
+      return cats.send("submitOrder", { book: BOOK_ID, quantity: QUANTITY });
+    });
+    expect(res1.stock).to.eql(stockBefore - QUANTITY);
+  });
+
+  it("calls unbound actions - named args variant", async () => {
+    // Use a managed transaction to create a continuation with an authenticated user
+    const res2 = await cats.tx({ user: "alice" }, () => {
+      return cats.submitOrder({ book: BOOK_ID, quantity: QUANTITY });
+    });
+    expect(res2.stock).to.eql(stockBefore - QUANTITY);
+  });
+
+  it("calls unbound actions - positional args variant", async () => {
+    // Use a managed transaction to create a continuation with an authenticated user
+    const res3 = await cats.tx({ user: "alice" }, () => {
+      return cats.submitOrder(BOOK_ID, QUANTITY);
+    });
+    expect(res3.stock).to.eql(stockBefore - QUANTITY);
+  });
+});

test/localized-data/services.test.js

@@ -27,15 +27,15 @@ describe('cap/samples - Localized Data', () => {
   })
 
   it('supports queries with $expand', async () => {
-    const { data } = await GET(`/browse/Books?&$select=title,author&$expand=currency`, {
+    const { data } = await GET(`/browse/Book?&$select=title,author,currencyName`, {
       headers: { 'Accept-Language': 'de' },
     })
     expect(data.value).to.containSubset([
-      { title: 'Sturmhöhe', author: 'Emily Brontë', currency: { name: 'Pfund' } },
+      { title: 'Sturmhöhe', author: 'Emily Brontë', currencyName: 'Pfund' },
-      { title: 'Jane Eyre', author: 'Charlotte Brontë', currency: { name: 'Pfund' } },
+      { title: 'Jane Eyre', author: 'Charlotte Brontë', currencyName: 'Pfund' },
-      { title: 'The Raven', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
+      { title: 'The Raven', author: 'Edgar Allen Poe', currencyName: 'US-Dollar' },
-      { title: 'Eleonora', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
+      { title: 'Eleonora', author: 'Edgar Allen Poe', currencyName: 'US-Dollar' },
-      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Yen' } },
+      { title: 'Catweazle', author: 'Richard Carpenter', currencyName: 'Yen' },
     ])
   })
 

test/odata.test.js

@@ -12,20 +12,20 @@ describe('cap/samples - Bookshop APIs', () => {
       'odata-version': '4.0',
     })
     expect(headers['content-type']).to.match(/application\/xml/)
-    expect(data).to.contain('<EntitySet Name="Books" EntityType="CatalogService.Books">')
+    expect(data).to.contain('<EntitySet Name="Books" EntityType="CatalogService.Books"/>')
-    expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
+    expect(data).to.contain('<Annotation Term="Common.Label" String="Currency Symbol"/>')
   })
 
-  it('serves ListOfBooks?$expand=genre,currency', async () => {
+  it('serves Books?$expand=genre,currency', async () => {
     const Mystery = { ID: 16, name: 'Mystery', descr: null, parent_ID: 10 }
     const Romance = { ID: 15, name: 'Romance', descr: null, parent_ID: 10 }
     const USD = { code: 'USD', name: 'US Dollar', descr: null, symbol: '$' }
-    const { data } = await GET `/browse/ListOfBooks ${{
+    const { data } = await GET `/admin/Books ${{
       params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
     }}`
     expect(data.value).to.containSubset([
-      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
+      { ID: 251, title: 'The Raven', author_ID: 150, genre:Mystery, currency:USD  },
-      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Romance, currency:USD  },
+      { ID: 252, title: 'Eleonora', author_ID: 150, genre:Romance, currency:USD  },
     ])
   })