Moving lifetime + age to where it is used

Signed-off-by: Daniel <daniel.hutzel@sap.com>

bookstore/db/schema.cds

@@ -1,8 +0,0 @@
-using { sap.capire.bookshop } from '@capire/bookshop';
-
-// Forward-declare calculated fields to be filled in database-specific ways
-// TODO find a better way to have 'default' fields that still can be overwritten.
-extend bookshop.Authors with {
-	virtual age: Integer;
-	virtual lifetime: String;
-}

bookstore/index.cds

@@ -1,4 +1,2 @@
 namespace sap.capire.bookshop; //> important for reflection
-
-using from '@capire/bookshop';
-using from './db/schema';
+using from './srv/mashup';

bookstore/package.json

@@ -25,13 +25,7 @@
         "[production]": { "kind": "enterprise-messaging" }
       },
       "db": {
-        "kind": "sql",
-        "[development]": {
-          "model": "db/sqlite"
-        },
-        "[production]": {
-          "model": "db/hana"
-        }
+        "kind": "sql"
       }
     },
     "log": { "service": true }

fiori/db/hana/index.cds

@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '../schema';
+using { AdminService } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,

fiori/db/sqlite/index.cds

@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '../schema';
+using { AdminService } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,

fiori/package.json

@@ -29,6 +29,15 @@
         "[development]": { "kind": "file-based-messaging" },
         "[hybrid!]": { "kind": "enterprise-messaging-shared" }
       },
+      "db": {
+        "kind": "sql",
+        "[development]": {
+          "model": "db/sqlite"
+        },
+        "[production]": {
+          "model": "db/hana"
+        }
+      },
       "hana": {
         "deploy-format": "hdbtable"
       }