remove bookshop service, rename app router directory

SAP-samples · Dec 20, 2024 · b396108 · b396108
1 parent 44088c6
commit b396108
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 201 deletions.
diff --git a/app-router/bookshop b/app-router/bookshop
@@ -0,0 +1 @@
+../bookshop/app/vue
diff --git a/app-router/orders b/app-router/orders
@@ -0,0 +1 @@
+../orders/app/orders
diff --git a/app/router/package-lock.json → app-router/package-lock.json b/app/router/package-lock.json → app-router/package-lock.json
diff --git a/app/router/package.json → app-router/package.json b/app/router/package.json → app-router/package.json
diff --git a/app-router/reviews b/app-router/reviews
@@ -0,0 +1 @@
+../reviews/app/vue
diff --git a/app/router/xs-app.json → app-router/xs-app.json b/app/router/xs-app.json → app-router/xs-app.json
@@ -14,19 +14,19 @@
     {
       "source": "^/admin/(.*)$",
       "target": "/admin/$1",
-      "destination": "bookshop-api",
+      "destination": "bookstore-api",
       "csrfProtection": true
     },
     {
       "source": "^/browse/(.*)$",
       "target": "/browse/$1",
-      "destination": "bookshop-api",
+      "destination": "bookstore-api",
       "csrfProtection": true
     },
     {
       "source": "^/user/(.*)$",
       "target": "/user/$1",
-      "destination": "bookshop-api",
+      "destination": "bookstore-api",
       "csrfProtection": true
     },
     {
@@ -41,24 +41,6 @@
       "destination": "reviews-api",
       "csrfProtection": true
     },
-    {
-      "source": "^/mashup/admin/(.*)$",
-      "target": "/admin/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/mashup/browse/(.*)$",
-      "target": "/browse/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/mashup/user/(.*)$",
-      "target": "/user/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
     {
       "source": "^(.*)$",
       "target": "$1",

diff --git a/app/router/bookshop b/app/router/bookshop
diff --git a/app/router/orders b/app/router/orders
diff --git a/app/router/reviews b/app/router/reviews
diff --git a/bookshop/srv/fiori.cds → bookstore/srv/fiori.cds b/bookshop/srv/fiori.cds → bookstore/srv/fiori.cds
diff --git a/bookstore/srv/mashup.js b/bookstore/srv/mashup.js
@@ -26,8 +26,7 @@ module.exports = async()=>{ // called by server.js
   //
   // Create an order with the OrdersService when CatalogService signals a new order
   //
-  const messaging = await cds.connect.to('messaging')
-  messaging.on('CatalogService.OrderedBook', async (msg) => {
+  CatalogService.on('OrderedBook', async (msg) => {
     const { book, quantity, buyer } = msg.data
     const { title, price } = await db.read (Books, book, b => { b.title, b.price })
     return OrdersService.create ('OrdersNoDraft').entries({

diff --git a/db/src/.hdiconfig b/db/src/.hdiconfig
diff --git a/db/undeploy.json b/db/undeploy.json
diff --git a/mta.yaml b/mta.yaml
@@ -10,31 +10,10 @@ build-parameters:
       commands:
         - npm ci
         - npx cds build --for hana --production --ws
-        - npx cds build ./bookshop --for nodejs --production --ws-pack
         - npx cds build ./orders --for nodejs --production --ws-pack
         - npx cds build ./reviews --for nodejs --production --ws-pack
         - npx cds build ./bookstore --for nodejs --production --ws-pack
 modules:
-  - name: bookshop-srv
-    type: nodejs
-    path: bookshop/gen/srv
-    parameters:
-      buildpack: nodejs_buildpack
-      readiness-health-check-type: http
-      readiness-health-check-http-endpoint: /health
-      disk-quota: 256M
-      memory: 256M
-    build-parameters:
-      builder: npm
-    provides:
-      - name: bookshop-api
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-messaging
-      - name: samples-db
-      - name: samples-auth
-
   - name: orders-srv
     type: nodejs
     path: orders/gen/srv
@@ -106,18 +85,12 @@ modules:
 
   - name: samples
     type: approuter.nodejs
-    path: app/router
+    path: app-router
     parameters:
       keep-existing-routes: true
       disk-quota: 256M
       memory: 256M
     requires:
-      - name: bookshop-api
-        group: destinations
-        properties:
-          name: bookshop-api # must be used in xs-app.json as well
-          url: ~{srv-url}
-          forwardAuthToken: true
       - name: orders-api
         group: destinations
         properties:
@@ -141,7 +114,6 @@ modules:
   - name: destination-content
     type: com.sap.application.content
     requires:
-      - name: bookshop-api
       - name: orders-api
       - name: reviews-api
       - name: bookstore-api