Fix DP package assignment (#195)

Author: swennemers

__tests__/mockedCsn.test.js

@@ -143,7 +143,10 @@ describe("Tests for ORD document generated out of mocked csn files", () => {
             );
             expect(dataProductApiResources).toHaveLength(1);
             expect(dataProductApiResources[0].resourceDefinitions).toHaveLength(1);
-            expect(dataProductApiResources[0].resourceDefinitions[0]).type === "sap-csn-interop-effective-v1";
+            expect(dataProductApiResources[0].resourceDefinitions[0].type).toEqual("sap-csn-interop-effective-v1");
+            expect(dataProductApiResources[0].partOfPackage).toEqual(
+                "sap.test.cdsrc.sample:package:capirebookshopordsample-api-internal:v1",
+            );
         });
 
         test("Should not generate duplicate apiResources when the servie is annotated as primary data product ", () => {

lib/templates.js

@@ -242,7 +242,9 @@ const createEntityTypeTemplate = (appConfig, packageIds, entity) => {
 
 function _handleVisibility(ordExtensions, definition) {
     let visibility;
-    if (ordExtensions.visibility) {
+    if (isPrimaryDataProductService(definition)) {
+        visibility = RESOURCE_VISIBILITY.internal;
+    } else if (ordExtensions.visibility) {
         visibility = ordExtensions.visibility;
     } else if (definition[ORD_EXTENSIONS_PREFIX + "visibility"]) {
         visibility = definition[ORD_EXTENSIONS_PREFIX + "visibility"];
@@ -307,9 +309,8 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
             ...ordExtensions,
         };
 
-        if (serviceDefinition[DATA_PRODUCT_ANNOTATION] === DATA_PRODUCT_TYPE.primary) {
+        if (isPrimaryDataProductService(serviceDefinition)) {
             obj.apiProtocol = "rest";
-            obj.visibility = RESOURCE_VISIBILITY.internal;
             obj.direction = "outbound";
             obj.implementationStandard = "sap.dp:data-subscription-api:v1";
             obj.entryPoints = [];
@@ -383,6 +384,10 @@ const createEventResourceTemplate = (serviceName, serviceDefinition, appConfig,
         : [];
 };
 
+function isPrimaryDataProductService(serviceDefinition) {
+    return serviceDefinition[DATA_PRODUCT_ANNOTATION] === DATA_PRODUCT_TYPE.primary;
+}
+
 function _getEntityTypeMappings(definitionObj) {
     if (!definitionObj.entities) {
         return;