agrs-sequelize-sdk 1.2.99 → 1.3.1

package/run.sh

@@ -1,214 +1,214 @@
-# #!/bin/bash
-
-# # Check if root is only required for jq installation
-# require_root_for_jq=0
-
-# # Check if jq is installed
-# if ! command -v jq &> /dev/null; then
-#     echo "jq not found. Installing jq..."
-#     require_root_for_jq=1
-#     if command -v apt-get &> /dev/null; then
-#         sudo apt-get update && sudo apt-get install -y jq
-#     elif command -v brew &> /dev/null; then
-#         brew install jq
-#     else
-#         echo "Please install jq manually."
-#         exit 1
-#     fi
-# fi
-
-# # Only require root if jq installation was needed
-# if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
-#     echo "This script must be run as root for jq installation. Please use sudo."
-#     exit 1
-# fi
-
-# # Step 1: Check if logged in to NPM
-# npmUsername=$(npm whoami 2>&1)
-# if [[ $npmUsername == *"ERR"* ]]; then
-#     echo "Not logged in. Please log in to NPM."
-#     npm login
-#     if [[ $? -ne 0 ]]; then
-#         echo "NPM login failed. Exiting..."
-#         exit 1
-#     fi
-# else
-#     echo "Already logged in to NPM as $npmUsername"
-# fi
-
-# # Step 2: Increment version in package.json
-# if [[ ! -f package.json ]]; then
-#     echo "package.json not found. Exiting..."
-#     exit 1
-# fi
-
-# currentVersion=$(jq -r '.version' package.json)
-
-# if [[ -z "$currentVersion" ]]; then
-#     echo "Could not find version in package.json"
-#     exit 1
-# fi
-
-# # Split version into major, minor, patch
-# IFS='.' read -r major minor patch <<< "$currentVersion"
-
-# # Increment version numbers with three-digit logic
-# if [[ $patch -eq 99 ]]; then
-#     patch=0
-#     if [[ $minor -eq 99 ]]; then
-#         minor=0
-#         ((major++))
-#     else
-#         ((minor++))
-#     fi
-# else
-#     ((patch++))
-# fi
-
-# newVersion="$major.$minor.$patch"
-
-# # Update the version in package.json while maintaining formatting
-# jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
-# echo "Version updated from $currentVersion to $newVersion"
-
-# # Step 3: Publish the package to NPM
-# npm publish
-# if [[ $? -ne 0 ]]; then
-#     echo "NPM publish failed. Exiting..."
-#     exit 1
-# fi
-
-# # Step 4: Commit the changes and push to GitHub
-# git add .
-# git commit -m "Bump version to $newVersion"
-# git push origin main
-
-# if [[ $? -ne 0 ]]; then
-#     echo "Failed to push changes to GitHub. Exiting..."
-#     exit 1
-# fi
-
-# echo "Version $newVersion published and changes pushed to GitHub successfully!"
-
-
-#!/bin/bash
-
-# Check if root is only required for jq installation
-require_root_for_jq=0
-
-# Check if jq is installed
-if ! command -v jq &> /dev/null; then
-    echo "jq not found. Installing jq..."
-    require_root_for_jq=1
-    if command -v apt-get &> /dev/null; then
-        sudo apt-get update && sudo apt-get install -y jq
-    elif command -v brew &> /dev/null; then
-        brew install jq
-    else
-        echo "Please install jq manually."
-        exit 1
-    fi
-fi
-
-# Only require root if jq installation was needed
-if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
-    echo "This script must be run as root for jq installation. Please use sudo."
-    exit 1
-fi
-
-# Step 1: Check if logged in to NPM
-npmUsername=$(npm whoami 2>&1)
-if [[ $npmUsername == *"ERR"* ]]; then
-    echo "Not logged in. Please log in to NPM."
-    npm login
-    if [[ $? -ne 0 ]]; then
-        echo "NPM login failed. Exiting..."
-        exit 1
-    fi
-else
-    echo "Already logged in to NPM as $npmUsername"
-fi
-
-# Step 2: Check the latest published version from NPM
-packageName=$(jq -r '.name' package.json)
-if [[ -z "$packageName" ]]; then
-    echo "Could not find package name in package.json"
-    exit 1
-fi
-
-latestPublishedVersion=$(npm view "$packageName" version)
-if [[ $? -ne 0 ]]; then
-    echo "Failed to fetch the latest published version. Exiting..."
-    exit 1
-fi
-
-echo "Latest published version on NPM: $latestPublishedVersion"
-
-# Step 3: Increment version in package.json
-if [[ ! -f package.json ]]; then
-    echo "package.json not found. Exiting..."
-    exit 1
-fi
-
-currentVersion=$(jq -r '.version' package.json)
-
-if [[ -z "$currentVersion" ]]; then
-    echo "Could not find version in package.json"
-    exit 1
-fi
-
-# Split version into major, minor, patch
-IFS='.' read -r major minor patch <<< "$currentVersion"
-
-# Increment version numbers with three-digit logic
-if [[ $patch -eq 99 ]]; then
-    patch=0
-    if [[ $minor -eq 99 ]]; then
-        minor=0
-        ((major++))
-    else
-        ((minor++))
-    fi
-else
-    ((patch++))
-fi
-
-newVersion="$major.$minor.$patch"
-
-# Ensure the new version is greater than the latest published version
-if [[ "$(printf '%s\n' "$newVersion" "$latestPublishedVersion" | sort -V | tail -1)" != "$newVersion" ]]; then
-    echo "Error: New version ($newVersion) is not greater than the latest published version ($latestPublishedVersion)."
-    echo "Please manually update the version in package.json or adjust the script logic."
-    exit 1
-fi
-
-# Update the version in package.json while maintaining formatting
-jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
-echo "Version updated from $currentVersion to $newVersion"
-
-# Step 4: Publish the package to NPM
-npm publish
-if [[ $? -ne 0 ]]; then
-    echo "NPM publish failed. Exiting..."
-    exit 1
-fi
-
-# Step 5: Commit the changes and push to GitHub
-git add .
-git commit -m "Bump version to $newVersion"
-
-# Pull latest changes to ensure there are no conflicts
-git pull origin main --rebase
-if [[ $? -ne 0 ]]; then
-    echo "Git pull failed. Please resolve conflicts manually. Exiting..."
-    exit 1
-fi
-
-# Push changes to remote
-git push origin main
-if [[ $? -ne 0 ]]; then
-    echo "Failed to push changes to GitHub. Exiting..."
-    exit 1
-fi
-
-echo "Version $newVersion published and changes pushed to GitHub successfully!"
+# #!/bin/bash
+
+# # Check if root is only required for jq installation
+# require_root_for_jq=0
+
+# # Check if jq is installed
+# if ! command -v jq &> /dev/null; then
+#     echo "jq not found. Installing jq..."
+#     require_root_for_jq=1
+#     if command -v apt-get &> /dev/null; then
+#         sudo apt-get update && sudo apt-get install -y jq
+#     elif command -v brew &> /dev/null; then
+#         brew install jq
+#     else
+#         echo "Please install jq manually."
+#         exit 1
+#     fi
+# fi
+
+# # Only require root if jq installation was needed
+# if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
+#     echo "This script must be run as root for jq installation. Please use sudo."
+#     exit 1
+# fi
+
+# # Step 1: Check if logged in to NPM
+# npmUsername=$(npm whoami 2>&1)
+# if [[ $npmUsername == *"ERR"* ]]; then
+#     echo "Not logged in. Please log in to NPM."
+#     npm login
+#     if [[ $? -ne 0 ]]; then
+#         echo "NPM login failed. Exiting..."
+#         exit 1
+#     fi
+# else
+#     echo "Already logged in to NPM as $npmUsername"
+# fi
+
+# # Step 2: Increment version in package.json
+# if [[ ! -f package.json ]]; then
+#     echo "package.json not found. Exiting..."
+#     exit 1
+# fi
+
+# currentVersion=$(jq -r '.version' package.json)
+
+# if [[ -z "$currentVersion" ]]; then
+#     echo "Could not find version in package.json"
+#     exit 1
+# fi
+
+# # Split version into major, minor, patch
+# IFS='.' read -r major minor patch <<< "$currentVersion"
+
+# # Increment version numbers with three-digit logic
+# if [[ $patch -eq 99 ]]; then
+#     patch=0
+#     if [[ $minor -eq 99 ]]; then
+#         minor=0
+#         ((major++))
+#     else
+#         ((minor++))
+#     fi
+# else
+#     ((patch++))
+# fi
+
+# newVersion="$major.$minor.$patch"
+
+# # Update the version in package.json while maintaining formatting
+# jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
+# echo "Version updated from $currentVersion to $newVersion"
+
+# # Step 3: Publish the package to NPM
+# npm publish
+# if [[ $? -ne 0 ]]; then
+#     echo "NPM publish failed. Exiting..."
+#     exit 1
+# fi
+
+# # Step 4: Commit the changes and push to GitHub
+# git add .
+# git commit -m "Bump version to $newVersion"
+# git push origin main
+
+# if [[ $? -ne 0 ]]; then
+#     echo "Failed to push changes to GitHub. Exiting..."
+#     exit 1
+# fi
+
+# echo "Version $newVersion published and changes pushed to GitHub successfully!"
+
+
+#!/bin/bash
+
+# Check if root is only required for jq installation
+require_root_for_jq=0
+
+# Check if jq is installed
+if ! command -v jq &> /dev/null; then
+    echo "jq not found. Installing jq..."
+    require_root_for_jq=1
+    if command -v apt-get &> /dev/null; then
+        sudo apt-get update && sudo apt-get install -y jq
+    elif command -v brew &> /dev/null; then
+        brew install jq
+    else
+        echo "Please install jq manually."
+        exit 1
+    fi
+fi
+
+# Only require root if jq installation was needed
+if [[ $require_root_for_jq -eq 1 && $EUID -ne 0 ]]; then
+    echo "This script must be run as root for jq installation. Please use sudo."
+    exit 1
+fi
+
+# Step 1: Check if logged in to NPM
+npmUsername=$(npm whoami 2>&1)
+if [[ $npmUsername == *"ERR"* ]]; then
+    echo "Not logged in. Please log in to NPM."
+    npm login
+    if [[ $? -ne 0 ]]; then
+        echo "NPM login failed. Exiting..."
+        exit 1
+    fi
+else
+    echo "Already logged in to NPM as $npmUsername"
+fi
+
+# Step 2: Check the latest published version from NPM
+packageName=$(jq -r '.name' package.json)
+if [[ -z "$packageName" ]]; then
+    echo "Could not find package name in package.json"
+    exit 1
+fi
+
+latestPublishedVersion=$(npm view "$packageName" version)
+if [[ $? -ne 0 ]]; then
+    echo "Failed to fetch the latest published version. Exiting..."
+    exit 1
+fi
+
+echo "Latest published version on NPM: $latestPublishedVersion"
+
+# Step 3: Increment version in package.json
+if [[ ! -f package.json ]]; then
+    echo "package.json not found. Exiting..."
+    exit 1
+fi
+
+currentVersion=$(jq -r '.version' package.json)
+
+if [[ -z "$currentVersion" ]]; then
+    echo "Could not find version in package.json"
+    exit 1
+fi
+
+# Split version into major, minor, patch
+IFS='.' read -r major minor patch <<< "$currentVersion"
+
+# Increment version numbers with three-digit logic
+if [[ $patch -eq 99 ]]; then
+    patch=0
+    if [[ $minor -eq 99 ]]; then
+        minor=0
+        ((major++))
+    else
+        ((minor++))
+    fi
+else
+    ((patch++))
+fi
+
+newVersion="$major.$minor.$patch"
+
+# Ensure the new version is greater than the latest published version
+if [[ "$(printf '%s\n' "$newVersion" "$latestPublishedVersion" | sort -V | tail -1)" != "$newVersion" ]]; then
+    echo "Error: New version ($newVersion) is not greater than the latest published version ($latestPublishedVersion)."
+    echo "Please manually update the version in package.json or adjust the script logic."
+    exit 1
+fi
+
+# Update the version in package.json while maintaining formatting
+jq --arg version "$newVersion" '.version = $version' package.json > tmp.json && mv tmp.json package.json
+echo "Version updated from $currentVersion to $newVersion"
+
+# Step 4: Publish the package to NPM
+npm publish
+if [[ $? -ne 0 ]]; then
+    echo "NPM publish failed. Exiting..."
+    exit 1
+fi
+
+# Step 5: Commit the changes and push to GitHub
+git add .
+git commit -m "Bump version to $newVersion"
+
+# Pull latest changes to ensure there are no conflicts
+git pull origin main --rebase
+if [[ $? -ne 0 ]]; then
+    echo "Git pull failed. Please resolve conflicts manually. Exiting..."
+    exit 1
+fi
+
+# Push changes to remote
+git push origin main
+if [[ $? -ne 0 ]]; then
+    echo "Failed to push changes to GitHub. Exiting..."
+    exit 1
+fi
+
+echo "Version $newVersion published and changes pushed to GitHub successfully!"

package/services/sequelizeService.js

@@ -1,63 +1,63 @@
-// services/sequelizeService.js
-const DBModels = require("../index");
-const { env } = require("../../agrs-dashboard/env");
-
-async function syncDatabase() {
-  console.log("Starting database synchronization...");
-
-  try {
-    // Load environment variables
-    await require("../../agrs-dashboard/env").loadSecrets();
-
-    // Configuration
-    const config = {
-      username: env.DB_USERNAME,
-      password: env.DB_PASSWORD,
-      database: env.DB_NAME,
-      host: env.DB_HOST,
-      port: env.DB_PORT,
-      dialect: "postgres",
-    };
-
-    // Initialize DB
-    const dbModelInstance = new DBModels(config);
-    const db = dbModelInstance.db;
-
-    // Test connection
-    await db.sequelize.authenticate();
-    console.log("Database connection established successfully.");
-
-    // List all models
-    console.log("\n=== MODELS TO BE SYNCED ===");
-    const modelNames = Object.keys(db).filter(
-      (key) =>
-        typeof db[key] === "function" &&
-        db[key].prototype &&
-        db[key].prototype.constructor.name === "Model"
-    );
-
-    modelNames.forEach((modelName) => {
-      console.log(`- ${modelName}`);
-    });
-    console.log("==============================\n");
-
-    // Sync with alter: true to update schema
-    console.log("Syncing database schema...");
-    await db.sequelize.sync({ alter: true });
-
-    console.log("✅ Database synchronized successfully!");
-    console.log("Schema has been updated to match model definitions.");
-
-    process.exit(0);
-  } catch (error) {
-    console.error("❌ Error during database synchronization:", error);
-    process.exit(1);
-  }
-}
-
-// Run if called directly
-if (require.main === module) {
-  syncDatabase();
-}
-
-module.exports = { syncDatabase };
+// services/sequelizeService.js
+const DBModels = require("../index");
+const { env } = require("../../agrs-dashboard/env");
+
+async function syncDatabase() {
+  console.log("Starting database synchronization...");
+
+  try {
+    // Load environment variables
+    await require("../../agrs-dashboard/env").loadSecrets();
+
+    // Configuration
+    const config = {
+      username: env.DB_USERNAME,
+      password: env.DB_PASSWORD,
+      database: env.DB_NAME,
+      host: env.DB_HOST,
+      port: env.DB_PORT,
+      dialect: "postgres",
+    };
+
+    // Initialize DB
+    const dbModelInstance = new DBModels(config);
+    const db = dbModelInstance.db;
+
+    // Test connection
+    await db.sequelize.authenticate();
+    console.log("Database connection established successfully.");
+
+    // List all models
+    console.log("\n=== MODELS TO BE SYNCED ===");
+    const modelNames = Object.keys(db).filter(
+      (key) =>
+        typeof db[key] === "function" &&
+        db[key].prototype &&
+        db[key].prototype.constructor.name === "Model"
+    );
+
+    modelNames.forEach((modelName) => {
+      console.log(`- ${modelName}`);
+    });
+    console.log("==============================\n");
+
+    // Sync with alter: true to update schema
+    console.log("Syncing database schema...");
+    await db.sequelize.sync({ alter: true });
+
+    console.log("✅ Database synchronized successfully!");
+    console.log("Schema has been updated to match model definitions.");
+
+    process.exit(0);
+  } catch (error) {
+    console.error("❌ Error during database synchronization:", error);
+    process.exit(1);
+  }
+}
+
+// Run if called directly
+if (require.main === module) {
+  syncDatabase();
+}
+
+module.exports = { syncDatabase };