fix: properly generate krakend config,nginx config and dockercompose files

Author: GAndanje

.suite-cli/cli/scripts/assets/dockerComposeContent.asset.js

@@ -1,21 +1,21 @@
 module.exports = ({ services, webserver, krakend_port, env }) => {
   const servicesConfig = services.map(service => `
-  ${service.toLowerCase().replace(/\s+/g, '-')}: 
+  ${service.name.toLowerCase().replace(/\s+/g, '-')}: 
     build: 
       dockerfile: Dockerfile.dev 
-      context: ../../../microservices/${service} 
+      context: ../../../microservices/${service.name} 
     ports: 
-      - "${krakend_port}:${krakend_port}" 
+      - "${service.port}:${service.port}" 
     volumes: 
       - /app/node_modules 
-      - ../../../microservices/${service}:/app 
+      - ../../../microservices/${service.name}:/app 
     depends_on:
       rabbitmq:
         condition: service_healthy
 `).join('');
 
   // Collect all service names for the 'depends_on' section of the web server
-  const serviceNames = services.map(service => service.toLowerCase().replace(/\s+/g, '-'));
+  const serviceNames = services.map(service => service.name.toLowerCase().replace(/\s+/g, '-'));
 
   return `
 version: '3.8'

.suite-cli/cli/scripts/assets/krakendConfigContent.asset.js

@@ -9,30 +9,30 @@ module.exports = ({
   // Health check for all services
   const suiteStatusCheckBackends = services.map((service) => `
     {
-      "host": ["http://${service.toLowerCase()}:${service.port}"],
+      "host": ["http://${service.name.toLowerCase()}:${service.port}"],
       "url_pattern": "/",
       "mapping": {
-        "message": "${service.toLowerCase()}"
+        "message": "${service.name.toLowerCase()}"
       }
     }`).join(',\n');
 
   // List all services
   const allServicesListBackends = services.map((service) => `
     {
-      "host": ["http://${service.toLowerCase()}:${service.port}"],
-      "url_pattern": "/api/${api_version}/${service.toLowerCase()}s",
+      "host": ["http://${service.name.toLowerCase()}:${service.port}"],
+      "url_pattern": "/api/${api_version}/${service.name.toLowerCase()}s",
       "mapping": {
-        "data": "${service.toLowerCase()}s"
+        "data": "${service.name.toLowerCase()}s"
       }
     }`).join(',\n');
 
   // Each service backend
   const eachServiceListBackends = [services[0]].map((service) => `
     {
-      "host": ["http://${service.toLowerCase()}:${service.port}"],
-      "url_pattern": "/api/${api_version}/${service.toLowerCase()}s",
+      "host": ["http://${service.name.toLowerCase()}:${service.port}"],
+      "url_pattern": "/api/${api_version}/${service.name.toLowerCase()}s",
       "mapping": {
-        "data": "${service.toLowerCase()}s"
+        "data": "${service.name.toLowerCase()}s"
       }
     }`).join(',\n');
 
@@ -59,8 +59,8 @@ module.exports = ({
       "backend": [${allServicesListBackends}]
     },
     {
-      "@comment": "Fetch all data from the ${services[0].toLowerCase()} service",
-      "endpoint": "/api/${api_version}/${services[0].toLowerCase()}s",
+      "@comment": "Fetch all data from the ${services[0].name.toLowerCase()} service",
+      "endpoint": "/api/${api_version}/${services[0].name.toLowerCase()}s",
       "method": "GET",
       "backend": [${eachServiceListBackends}]
     }

.suite-cli/cli/scripts/scripts.module.js

@@ -1628,14 +1628,22 @@ const getDependencies = ({ type, workspace }) => {
 const scaffoldGateways = async ({ answers }) => {
     const { webserver } = readFileContent({ currentDir: cwd() });
     const { projectName } = readFileContent({ currentDir: cwd() });
-    const { apps } = answers;
+    let { apps } = answers;
     const project_root = generatRootPath({ currentDir: cwd() });
-
+    const service_objects = getExistingServices({ currentDir: cwd() });
+    // add port to services in each app eg ['auth']=>[{name:'auth',port:9001}]
+    apps = apps.map((app) => {
+        app.services.map((name, i) => {
+            const service_object = service_objects.find((s) => s.name === name);
+            app.services[i] = { name, port: service_object.port }
+        })
+        return app
+    })
     await Promise.all(apps.map(async (app) => {
         console.log('---------------------------------------------')
         console.log(`🦧${app.name}-gateway`)
         return scaffoldGateway({ project_root, app, answers, webserver, projectName })
-        
+
     }))
 }
 
@@ -1644,7 +1652,6 @@ const scaffoldGateway = ({ project_root, app, answers, webserver, projectName })
     const webserver_dir = join(app_directory, webserver);
     const krakend_dir = join(app_directory, 'krakend');
     const services = app.services;
-    const nginx_services = getExistingServices({ currentDir: cwd() });
     // Remove the directory if it already exists
     if (existsSync(krakend_dir)) {
         rmSync(krakend_dir, { recursive: true });
@@ -1668,7 +1675,7 @@ const scaffoldGateway = ({ project_root, app, answers, webserver, projectName })
     ora().succeed(`Generated docker-compose configs at: ${app_directory}`)
     switch (webserver) {
         case 'nginx':
-            generateNginxConfiguration({ services:nginx_services, webserver_dir });
+            generateNginxConfiguration({ services, webserver_dir });
             break
         default:
             ora().info('Handling other webservers');