agrs-sequelize-sdk 1.4.22 → 1.4.25

package/.worktrees/creation-logs-platform-code/run.sh

@@ -0,0 +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>/dev/null)
+if [[ $? -ne 0 || -z "$npmUsername" ]]; 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/.worktrees/creation-logs-platform-code/services/sequelizeService.js

@@ -0,0 +1,110 @@
+// 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
+    // NOTE: This is SAFE for VARCHAR->TEXT conversions (expanding type, no data loss)
+    // Sequelize will use ALTER COLUMN TYPE which preserves all existing data
+
+    // Safety check: Count existing AdSets before sync
+    let adSetCountBefore = null;
+    try {
+      const [result] = await db.sequelize.query(
+        'SELECT COUNT(*) as count FROM "AdSet"',
+        { type: db.sequelize.QueryTypes.SELECT }
+      );
+      adSetCountBefore = result.count;
+      console.log(`📊 Current AdSet count in database: ${adSetCountBefore}`);
+    } catch (error) {
+      console.log("⚠️  Could not count AdSets (table might not exist yet)");
+    }
+
+    console.log("Syncing database schema...");
+    console.log(
+      "⚠️  Using alter: true - this will update column types to match models"
+    );
+    console.log(
+      "   Safe operations: VARCHAR->TEXT (expanding), adding columns"
+    );
+    console.log(
+      "   Unsafe operations: TEXT->VARCHAR (truncating), dropping columns"
+    );
+
+    await db.sequelize.sync({ alter: true });
+
+    // Safety check: Verify AdSet count after sync
+    if (adSetCountBefore !== null) {
+      try {
+        const [result] = await db.sequelize.query(
+          'SELECT COUNT(*) as count FROM "AdSet"',
+          { type: db.sequelize.QueryTypes.SELECT }
+        );
+        const adSetCountAfter = result.count;
+        console.log(`📊 AdSet count after sync: ${adSetCountAfter}`);
+        if (adSetCountBefore !== adSetCountAfter) {
+          console.error(
+            `❌ WARNING: AdSet count changed from ${adSetCountBefore} to ${adSetCountAfter}!`
+          );
+        } else {
+          console.log("✅ AdSet count unchanged - no data loss confirmed");
+        }
+      } catch (error) {
+        console.log("⚠️  Could not verify AdSet count after sync");
+      }
+    }
+
+    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 };

package/.worktrees/pixels-platform-code/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Agressive Scale LTD
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/.worktrees/pixels-platform-code/README.md

@@ -0,0 +1,179 @@
+# agrs-sequelize SDK
+
+The `agrs-sequelize` SDK provides a structured way to manage your database models using Sequelize ORM. It allows you to easily add, update, and manage models, with support for publishing updates to NPM and pushing changes to GitHub.
+
+## Table of Contents
+
+- [Prerequisites](#prerequisites)
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Adding or Modifying Models](#adding-or-modifying-models)
+  - [Model Loading](#model-loading)
+- [Publishing Changes](#publishing-changes)
+  - [Using PowerShell (Windows)](#using-powershell-windows)
+  - [Using Bash (Linux/macOS)](#using-bash-linuxmacos)
+- [Script Details](#script-details)
+  - [run.ps1 (PowerShell Script for Windows)](#runps1-powershell-script-for-windows)
+  - [run.sh (Bash Script for Linux/macOS)](#runsh-bash-script-for-linuxmacos)
+- [Example Model File](#example-model-file)
+- [Versioning](#versioning)
+- [Troubleshooting](#troubleshooting)
+- [License](#license)
+
+## Prerequisites
+
+Ensure the following dependencies are installed on your system:
+
+- **Node.js**: [Download Node.js](https://nodejs.org/)
+- **Sequelize**: Used for database interaction.
+- **Git**: Required for version control and publishing changes to GitHub.
+- **npm**: For managing and publishing packages.
+- **PowerShell** (Windows) or **Bash** (Linux/macOS): For running automation scripts.
+
+## Installation
+
+1. **Clone the Repository:**
+
+   ```bash
+   git clone https://github.com/your-repo/agrs-sequelize.git
+   cd agrs-sequelize
+    ```
+
+2. **Install Dependencies:**
+
+   ```bash
+        npm install
+    ```
+
+
+# Usage
+
+## Adding or Modifying Models
+To add or modify models in the agrs-sequelize SDK:
+
+1. **Create or Edit a Model:**
+
+    - Add a new model file inside the models directory or edit an existing one.
+    - Each model file should export a function that initializes the model with Sequelize.
+
+```javascript
+// models/YourModel.js
+module.exports = (sequelize, DataTypes) => {
+  const YourModel = sequelize.define('YourModel', {
+    fieldName: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+  });
+
+  // Define associations (optional)
+  YourModel.associate = (models) => {
+    YourModel.hasMany(models.OtherModel);
+  };
+
+  return YourModel;
+}; 
+```
+
+2. **Define Associations (if required):**
+
+    Use the associate method to define relationships with other models.
+    Associations like hasMany, belongsTo, etc., are supported.
+### Model Loading
+    Models are automatically loaded when initializing Sequelize.
+    The index.js file ensures all models in the models directory are properly loaded and associated.
+
+## Publishing Changes
+ After modifying or adding models, publish the changes to NPM and GitHub.
+
+### Using PowerShell (Windows)
+Open PowerShell as Administrator.
+
+Run the Script:
+
+```powershell
+./run.ps1
+```
+The script will:
+
+- Check for jq installation.
+- Bump the version in package.json.
+- Publish to NPM.
+- Commit and push changes to GitHub.
+
+### Using Bash (Linux/macOS)
+Open a Bash Terminal.
+
+Run the Script:
+
+```bash
+./run.sh
+```
+The script performs the same tasks as the PowerShell script, tailored for Bash environments.
+
+## Script Details
+### run.ps1 (PowerShell Script for Windows)
+Automates the publishing process:
+
+- Ensures jq is installed.
+- Increments the version in package.json.
+- Publishes the package to NPM.
+- Commits and pushes changes to GitHub.
+
+### run.sh (Bash Script for Linux/macOS)
+Provides similar functionality:
+
+- Checks for jq installation.
+- Bumps the package version.
+= Publishes to NPM.
+= Commits and pushes to GitHub.
+
+## Example Model File
+```javascript
+Copy code
+// models/YourModel.js
+module.exports = (sequelize, DataTypes) => {
+  const YourModel = sequelize.define('YourModel', {
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+  });
+
+  // Define associations (optional)
+  YourModel.associate = (models) => {
+    YourModel.hasMany(models.OtherModel);
+  };
+
+  return YourModel;
+};
+```
+In this example:
+
+YourModel has a name field.
+It has a hasMany association with OtherModel.
+## Versioning
+Versioning is handled automatically:
+
+- The scripts increment the version in package.json.
+- Follows semantic versioning (major, minor, patch).
+- Updated versions are published to NPM and committed to the repository.
+
+## Troubleshooting
+- ### Permission Issues:
+
+   - Linux/macOS: Ensure scripts have execute permissions (chmod +x run.sh).
+- ### NPM Login Errors:
+
+   - The script will prompt for NPM login if not already logged in.
+   - Verify NPM account credentials.
+
+- ### Missing Dependencies:
+
+   - The script checks for jq and installs it if missing.
+## License
+This project is licensed under the MIT License. See the LICENSE file for details.
+
+
+
+

package/.worktrees/pixels-platform-code/index.js

@@ -0,0 +1,169 @@
+const Sequelize = require("sequelize");
+const path = require("path");
+const fs = require("fs");
+
+// const env = process.env.NODE_ENV || "development";
+class DBModels {
+  constructor(config) {
+    this.config = config;
+    this.db = {};
+
+    // Initialize Sequelize
+    const sequelize = new Sequelize(
+      this.config.database,
+      this.config.username,
+      this.config.password,
+      {
+        host: this.config.host,
+        dialect: this.config.dialect,
+        port: this.config.port,
+        logging: false, // Enable logging to console
+        dialectOptions: {
+          ssl: {
+            require: true, // Require SSL
+            rejectUnauthorized: false, // For self-signed or unverified certificates
+          },
+        },
+        pool: {
+          max: 200, // Increase from 50, but stay under max_connections (200)
+          min: 5, // Increase minimum connections
+          acquire: 60000, // Double acquire timeout
+          idle: 30000, // Align with idle_in_transaction_session_timeout
+        },
+
+        retry: {
+          max: 5,
+          timeout: 60000,
+          match: [
+            /Connection terminated/,
+            /Connection timed out/,
+            /Operation timeout/,
+            /password authentication failed/,
+            /canceling authentication/,
+          ],
+        },
+      }
+    );
+
+    // Load all models
+    fs.readdirSync(path.join(__dirname, "models"))
+      .filter((file) => {
+        return file.indexOf(".") !== 0 && file.slice(-3) === ".js";
+      })
+      .forEach((file) => {
+        const model = require(path.join(__dirname, "models", file))(
+          sequelize,
+          Sequelize.DataTypes
+        );
+        this.db[model.name] = model;
+      });
+
+    // Set up associations
+    Object.keys(this.db).forEach((modelName) => {
+      if (this.db[modelName].associate) {
+        this.db[modelName].associate(this.db);
+      }
+    });
+
+    // Export the db object with Sequelize and models
+    this.db.sequelize = sequelize;
+    this.db.Sequelize = Sequelize;
+  }
+}
+
+module.exports = DBModels;
+
+// const Sequelize = require("sequelize");
+// const path = require("path");
+// const fs = require("fs");
+
+// class DBModels {
+//   constructor(config) {
+//     this.config = config;
+//     this.db = {};
+
+//     const sequelize = new Sequelize(
+//       this.config.database,
+//       this.config.username,
+//       this.config.password,
+//       {
+//         host: this.config.host,
+//         dialect: this.config.dialect,
+//         port: this.config.port,
+//         logging: false,
+//         dialectOptions: {
+//           ssl: {
+//             require: true,
+//             rejectUnauthorized: false,
+//           },
+//           statement_timeout: 30000,
+//           idle_in_transaction_session_timeout: 30000,
+//           connectTimeout: 30000,
+//         },
+//         pool: {
+//           max: 50, // Quarter of max connections (200)
+//           min: 0, // Start from 0 and scale up as needed
+//           acquire: 30000, // Maximum time to wait for a connection
+//           idle: 10000, // How long a connection can remain idle
+//         },
+//         retry: {
+//           max: 3,
+//           timeout: 20000,
+//           match: [
+//             /Connection terminated/,
+//             /Connection timed out/,
+//             /Operation timeout/,
+//             /ECONNRESET/,
+//             /PROTOCOL_CONNECTION_LOST/,
+//           ],
+//         },
+//       }
+//     );
+
+//     // Add connection monitoring listeners
+//     sequelize.connectionManager.on("acquire", function (connection) {
+//       console.log("Connection %d acquired", connection.threadId);
+//     });
+
+//     sequelize.connectionManager.on("release", function (connection) {
+//       console.log("Connection %d released", connection.threadId);
+//     });
+
+//     // Load all models
+//     fs.readdirSync(path.join(__dirname, "models"))
+//       .filter((file) => {
+//         return file.indexOf(".") !== 0 && file.slice(-3) === ".js";
+//       })
+//       .forEach((file) => {
+//         const model = require(path.join(__dirname, "models", file))(
+//           sequelize,
+//           Sequelize.DataTypes
+//         );
+//         this.db[model.name] = model;
+//       });
+
+//     // Set up associations
+//     Object.keys(this.db).forEach((modelName) => {
+//       if (this.db[modelName].associate) {
+//         this.db[modelName].associate(this.db);
+//       }
+//     });
+
+//     // Export the db object with Sequelize and models
+//     this.db.sequelize = sequelize;
+//     this.db.Sequelize = Sequelize;
+//   }
+
+//   // Add method for pool monitoring
+//   async getConnectionPoolStats() {
+//     const pool = this.db.sequelize.connectionManager.pool;
+//     return {
+//       all: pool.size,
+//       available: pool.available,
+//       borrowed: pool.borrowed,
+//       pending: pool.pending,
+//     };
+//   }
+// }
+
+// module.exports = DBModels;