change the version handling

cap-js · Dec 9, 2024 · a5fdaee · a5fdaee
1 parent 05a3736
commit a5fdaee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/__tests__/mockedCsn.test.js b/__tests__/mockedCsn.test.js
@@ -2,7 +2,7 @@ const cds = require("@sap/cds");
 const path = require("path");
 
 describe("Tests for ORD document generated out of mocked csn files", () => {
-    let ord;
+    let ord; //, errorSpy;
 
     function checkOrdDocument(csn) {
         const document = ord(csn);
@@ -26,11 +26,12 @@ describe("Tests for ORD document generated out of mocked csn files", () => {
             description: "this is my custom description",
             policyLevel: "sap:core:v1"
         };
+        // errorSpy = jest.spyOn(console, "error");
     });
 
     afterAll(() => {
+        jest.restoreAllMocks();
         jest.clearAllMocks();
-        jest.resetAllMocks();
     });
 
     describe("Tests for ORD document when .cdsrc.json has no `ord` property", () => {
@@ -100,4 +101,12 @@ describe("Tests for ORD document generated out of mocked csn files", () => {
             expect(document.eventResources[0].ordId).toEqual(expect.stringContaining("CatalogService"));
         });
     });
+
+    describe("Tests for ORD document when namespace is not correctly defined", () => {
+        test("Namespace is not correctly defined in cdsrc.json: throw error", () => {
+            cds.env.ord.namespace = "invalid_namespace";
+            const csn = require("./__mocks__/publicResourcesCsn.json");
+            expect(() => ord(csn)).toThrowError(expect.objectContaining({"message": expect.stringContaining("Namespace is not correctly defined in cdsrc.json")}));
+        });
+    });
 });
diff --git a/lib/ord.js b/lib/ord.js
@@ -139,11 +139,11 @@ function _getConsumptionBundles(appConfig) {
 function validateNamespace(appConfig) {
     const validateSystemNamespace = new RegExp(`^${appConfig.eventApplicationNamespace}\\.[^.]+\\..+$`);
     if (
-        appConfig.ordNamespace === undefined &&
+        appConfig.ordNamespace === undefined ||
         !validateSystemNamespace.test(appConfig.ordNamespace)
     ) {
         let error = new Error(
-            `Namespace is not defined in cdsrc.json or it is not in the format of ${appConfig.eventApplicationNamespace}.<appName>.<service>`
+            `Namespace is not correctly defined in cdsrc.json or it is not in the format of ${appConfig.eventApplicationNamespace}.<appName>.<service>`
         );
         Logger.error('Namespace error:', error.message);
         throw error;

diff --git a/lib/templates.js b/lib/templates.js
@@ -123,7 +123,7 @@ function _getTitleFromServiceName(srv) {
  */
 function _getEntityVersion(entity) {
     const entityVersion = entity.ordId.split(":").pop();
-    const version =  entityVersion === "v1" ? "1.0.0" : entityVersion;
+    const version =  entityVersion.replace("v", "") + ".0.0"; // TODO: version can be stated/overwritten by annotation
     if (!SEM_VERSION_REGEX.test(version)) {
         Logger.warn(`Entity version "${version}" is not a valid semantic version.`);
     }