From 6a910fe98eac9b35d9cf13f4e3394a28e3c74182 Mon Sep 17 00:00:00 2001
From: Yesha Mavani <yesha.mavani@sourcefuse.com>
Date: Fri, 8 Dec 2023 14:09:29 +0530
Subject: [PATCH 1/3] fix(cli): update the migration scripts as per workspaces

gh-1832
---
 packages/cli/README.md                                      | 2 +-
 packages/cli/package.json                                   | 2 +-
 packages/cli/src/generators/microservice/index.ts           | 6 +++---
 .../templates/packages/migrations/package.json.ejs          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cli/README.md b/packages/cli/README.md
index b0439c9251..c5f8429a6f 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -18,7 +18,7 @@ $ npm install -g @sourceloop/cli
 $ sl COMMAND
 running command...
 $ sl (-v|--version|version)
-@sourceloop/cli/6.0.1 linux-x64 node-v18.18.2
+@sourceloop/cli/6.0.1 darwin-arm64 node-v18.16.0
 $ sl --help [COMMAND]
 USAGE
   $ sl COMMAND
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5879210c05..fcc13912b2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -221,7 +221,7 @@
       "@sourceloop/video-conferencing-service": "^5.0.7",
       "@sourceloop/audit-log": "^5.3.0",
       "@sourceloop/vault": "^6.0.0",
-      "loopback4-authentication": "^11.0.0",
+      "loopback4-authentication": "^10.0.0",
       "loopback4-authorization": "^6.2.0",
       "loopback4-soft-delete": "^9.0.0",
       "loopback4-ratelimiter": "^6.0.0",
diff --git a/packages/cli/src/generators/microservice/index.ts b/packages/cli/src/generators/microservice/index.ts
index 265bb3e939..c4217fa5b4 100644
--- a/packages/cli/src/generators/microservice/index.ts
+++ b/packages/cli/src/generators/microservice/index.ts
@@ -534,13 +534,13 @@ export default class MicroserviceGenerator extends AppGenerator<MicroserviceOpti
       const script = packageJs.scripts;
       script[
         `db:migrate:${this.options.name}`
-      ] = `./node_modules/.bin/db-migrate up --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
+      ] = `db-migrate up --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
       script[
         `db:migrate-down:${this.options.name}`
-      ] = `./node_modules/.bin/db-migrate down --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
+      ] = `db-migrate down --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
       script[
         `db:migrate-reset:${this.options.name}`
-      ] = `./node_modules/.bin/db-migrate reset --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
+      ] = `db-migrate reset --config '${this.options.name}/database.json' -m '${this.options.name}/migrations'`;
 
       packageJs.scripts = script;
 
diff --git a/packages/cli/src/generators/migration-package/templates/packages/migrations/package.json.ejs b/packages/cli/src/generators/migration-package/templates/packages/migrations/package.json.ejs
index 35a0a5d342..ac78eb61d1 100644
--- a/packages/cli/src/generators/migration-package/templates/packages/migrations/package.json.ejs
+++ b/packages/cli/src/generators/migration-package/templates/packages/migrations/package.json.ejs
@@ -7,9 +7,9 @@
     "db:migrate": "run-s db:migrate:*",
     "db:migrate-down": "run-s db:migrate-down:*",
     "db:migrate-reset": "run-s db:migrate-reset:*",
-    "db:migrate:<%= project.name -%>": "./node_modules/.bin/db-migrate up --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'",
-    "db:migrate-down:<%= project.name -%>": "./node_modules/.bin/db-migrate down --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'",
-    "db:migrate-reset:<%= project.name -%>": "./node_modules/.bin/db-migrate reset --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'"
+    "db:migrate:<%= project.name -%>": "db-migrate up --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'",
+    "db:migrate-down:<%= project.name -%>": "db-migrate down --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'",
+    "db:migrate-reset:<%= project.name -%>": "db-migrate reset --config '<%= project.name -%>/database.json' -m '<%= project.name -%>/migrations'"
 
   },
   "author": "",

From 1178c36a2e86ddc8bf6ec4a4e50771096d1cc574 Mon Sep 17 00:00:00 2001
From: Yesha Mavani <yesha.mavani@sourcefuse.com>
Date: Fri, 8 Dec 2023 15:12:31 +0530
Subject: [PATCH 2/3] fix(cli): update the migration scripts as per workspaces

gh-1834
---
 packages/cli/README.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/cli/README.md b/packages/cli/README.md
index c5f8429a6f..f04c403f5f 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -13,29 +13,32 @@ npm install @sourceloop/cli
 ## Usage
 
 <!-- usage -->
+
 ```sh-session
 $ npm install -g @sourceloop/cli
 $ sl COMMAND
 running command...
 $ sl (-v|--version|version)
-@sourceloop/cli/6.0.1 darwin-arm64 node-v18.16.0
+@sourceloop/cli/6.0.1 linux-x64 node-v18.18.2
 $ sl --help [COMMAND]
 USAGE
   $ sl COMMAND
 ...
 ```
+
 <!-- usagestop -->
 
 ## Commands
 
 <!-- commands -->
-* [`sl autocomplete [SHELL]`](#sl-autocomplete-shell)
-* [`sl cdk`](#sl-cdk)
-* [`sl extension [NAME]`](#sl-extension-name)
-* [`sl help [COMMAND]`](#sl-help-command)
-* [`sl microservice [NAME]`](#sl-microservice-name)
-* [`sl scaffold [NAME]`](#sl-scaffold-name)
-* [`sl update`](#sl-update)
+
+- [`sl autocomplete [SHELL]`](#sl-autocomplete-shell)
+- [`sl cdk`](#sl-cdk)
+- [`sl extension [NAME]`](#sl-extension-name)
+- [`sl help [COMMAND]`](#sl-help-command)
+- [`sl microservice [NAME]`](#sl-microservice-name)
+- [`sl scaffold [NAME]`](#sl-scaffold-name)
+- [`sl update`](#sl-update)
 
 ## `sl autocomplete [SHELL]`
 
@@ -198,4 +201,5 @@ OPTIONS
 ```
 
 _See code: [src/commands/update.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v6.0.1/src/commands/update.ts)_
+
 <!-- commandsstop -->

From 19f6e2e2ddad37d0a0e5cad952a1ca8cff700b4a Mon Sep 17 00:00:00 2001
From: Yesha Mavani <yesha.mavani@sourcefuse.com>
Date: Fri, 8 Dec 2023 17:25:42 +0530
Subject: [PATCH 3/3] fix(cli): change migration scripts

gh-1834
---
 packages/cli/src/generators/microservice/index.ts      | 10 +++++-----
 .../src/generators/scaffold/templates/package.json.tpl |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/generators/microservice/index.ts b/packages/cli/src/generators/microservice/index.ts
index c4217fa5b4..531fe2f612 100644
--- a/packages/cli/src/generators/microservice/index.ts
+++ b/packages/cli/src/generators/microservice/index.ts
@@ -199,16 +199,16 @@ export default class MicroserviceGenerator extends AppGenerator<MicroserviceOpti
         'node -r ./dist/opentelemetry-registry.js -r source-map-support/register .';
       scripts[
         'docker:build'
-      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$npm_package_version .`;
+      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/$npm_package_name:$npm_package_version .`;
       scripts[
         'docker:push'
-      ] = `sudo docker push $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$npm_package_version`;
+      ] = `sudo docker push $IMAGE_REPO_NAME/$npm_package_name:$npm_package_version`;
       scripts[
         'docker:build:dev'
-      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$IMAGE_TAG_VERSION .`;
+      ] = `DOCKER_BUILDKIT=1 sudo docker build --build-arg NR_ENABLED=$NR_ENABLED_VALUE -t $IMAGE_REPO_NAME/$npm_package_name:$IMAGE_TAG_VERSION .`;
       scripts[
         'docker:push:dev'
-      ] = `sudo docker push $IMAGE_REPO_NAME/${this.options.uniquePrefix}-$npm_package_name:$IMAGE_TAG_VERSION`;
+      ] = `sudo docker push $IMAGE_REPO_NAME/$npm_package_name:$IMAGE_TAG_VERSION`;
       scripts['coverage'] = 'nyc npm run test';
 
       packageJson.scripts = scripts;
@@ -230,7 +230,7 @@ export default class MicroserviceGenerator extends AppGenerator<MicroserviceOpti
       await this.spawnCommand('npm', ['i']);
 
       await this.addMigrations();
-      this._appendDockerScript();
+      // this._appendDockerScript();
       return true;
     }
     return false;
diff --git a/packages/cli/src/generators/scaffold/templates/package.json.tpl b/packages/cli/src/generators/scaffold/templates/package.json.tpl
index 922cd098bb..4a3690e60e 100644
--- a/packages/cli/src/generators/scaffold/templates/package.json.tpl
+++ b/packages/cli/src/generators/scaffold/templates/package.json.tpl
@@ -4,7 +4,9 @@
   "private": true,
   "scripts": {
     "prepare": "husky install",
-    "test": "lerna run test"
+    "test": "lerna run test",
+     "migrate": "npm run db:migrate --workspaces --if-present",
+     "build": "npm run build --workspaces --if-present"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.1.0",