Separated reviewed and reviews

reviews/package.json

@@ -12,7 +12,7 @@
   },
   "scripts": {
     "reviews-service": "cds watch",
-    "bookshop": "cds watch test/bookshop"
+    "books-reviewed": "cds watch ../reviewed"
   },
   "cds": {
     "requires": {

reviews/test/4004.http

@@ -1,36 +0,0 @@
-#################################################
-#
-#   To ReviewsService mocked in bookshop process
-#
-
-GET http://localhost:4004/reviews/Reviews?
-
-###
-
-POST http://localhost:4004/reviews/Reviews
-Content-Type: application/json;IEEE754Compatible=true
-
-{"subject":"201", "title":"boo"}
-
-
-
-#################################################
-#
-#   Bookshop Requests involving reviews
-#   (both in-process as well as separate one)
-#
-
-
-### Request to CatalogService > delegated to ReviewsService
-GET http://localhost:4004/browse/Books(201)/reviews?
-&$select=rating,date,reviewer,title
-
-### Alternative OData URL
-GET http://localhost:4004/browse/Books/201/reviews?
-&$select=rating,date,reviewer,title
-
-###
-GET http://localhost:4004/browse/Books(201)?
-&$select=ID,title,rating
-&$expand=reviews
-# Note: the $expand only works in case of ReviewsService in same process

reviews/test/5005.http

@@ -1,13 +0,0 @@
-#################################################
-#
-#   To ReviewsService running as separate process
-#
-
-GET http://localhost:5005/reviews/Reviews?
-
-###
-
-POST http://localhost:5005/reviews/Reviews
-Content-Type: application/json;IEEE754Compatible=true
-
-{"subject":"201", "title":"boo"}

reviews/test/bookshop/package.json

@@ -1,23 +0,0 @@
-{
-  "name": "@capire/bookshop-with-reviews",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "../../../bookshop",
-    "@capire/reviews": "..",
-    "@sap/cds": "^3.33.1",
-    "express": "^4.17.1"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      },
-      "ReviewsService": {
-        "kind": "odata", "model": "@capire/reviews"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
-      }
-    }
-  }
-}

reviews/test/bookshop/schema.cds

@@ -1,16 +0,0 @@
-//
-//  Extending Books with Reviews
-//
-
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
-using { ReviewsService.Reviews } from '@capire/reviews';
-
-extend Books with {
-  /** Access to detailed collection of Reviews */
-  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  /** Average rating */
-  rating : Reviews.rating;
-}
-
-// Temporary workaround for cap/issues#4112:
-annotate Reviews with @cds.autoexpose;

reviews/test/bookshop/server.js

@@ -1,51 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//   This is an example of using a project-local server.js to intercept
-//   the default bootstrapping process.
-//
-
-const cds = require ('@sap/cds')
-
-// Mashup services after all are served...
-cds.once('served', async()=>{
-
-    // react on event messages from reviews service
-    const ReviewsService = await cds.connect.to ('ReviewsService')
-    const db = await cds.connect.to ('db')
-    ReviewsService.on ('reviewed', (msg) => {
-        console.debug ('> received:', msg.event, msg.data)
-        const { Books } = db.entities('sap.capire.bookshop')
-        const { subject, rating } = msg.data
-        const tx = db.tx (msg) // TODO: db.tx(msg) fully implemented?
-        return tx.update (Books,subject) .with ({rating})
-    })
-
-    // delegate requests to read reviews to ReviewsService
-    const CatalogService = await cds.connect.to ('CatalogService')
-    CatalogService.impl (srv => srv.on ('READ', 'Books/reviews', (req) => {
-        console.debug ('> delegating to ReviewsService')
-        const { Reviews } = ReviewsService.entities
-        const [ subject ] = req.params
-        const tx = ReviewsService.tx (req)
-        return tx.read (Reviews) .where({subject}) .columns (req.query.SELECT.columns)
-    }))
-
-})
-
-// Other bootstrapping events you could hook in to...
-/* eslint-disable no-unused-vars */
-cds.on('bootstrap',(app) => {/* ... */})
-cds.on('loaded', (model) => {/* ... */})
-cds.on('connect', (srv) => {/* ... */})
-cds.on('serving', (srv) => {/* ... */})
-cds.once('listening', ({server,url}) => {/* ... */})
-
-
-// Delegate bootstrapping to built-in server.js
-module.exports = cds.server
-
-// Monkey-patching older releases
-if (cds.version < '3.33.4') cds.once('listening', ()=> cds.emit('served'))
-
-// Launch server if started directly from command-line
-if (!module.parent)  cds.server()