fix: migrations

CHANGELOG.md

@@ -19,6 +19,7 @@
 * Remove instance from redis even if using database
 * Unified integration session system so they don't overlap
 * Temporary fix for pictureUrl bug in groups
+* Fix on migrations
 
 # 2.0.9-rc (2024-08-09 18:00)
 

Docker/scripts/deploy_database.sh

@@ -10,16 +10,16 @@ if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]
     export DATABASE_URL
     echo "Deploying migrations for $DATABASE_PROVIDER"
     echo "Database URL: $DATABASE_URL"
-    rm -rf ./prisma/migrations
+    # rm -rf ./prisma/migrations
-    cp -r ./prisma/$DATABASE_PROVIDER-migrations ./prisma/migrations
+    # cp -r ./prisma/$DATABASE_PROVIDER-migrations ./prisma/migrations
-    npx prisma migrate deploy --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
+    npm run db:deploy
     if [ $? -ne 0 ]; then
         echo "Migration failed"
         exit 1
     else
         echo "Migration succeeded"
     fi
-    npx prisma generate --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
+    npm run db:generate
     if [ $? -ne 0 ]; then
         echo "Prisma generate failed"
         exit 1

Docker/scripts/generate_database.sh

@@ -10,7 +10,7 @@ if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]
     export DATABASE_URL
     echo "Generating database for $DATABASE_PROVIDER"
     echo "Database URL: $DATABASE_URL"
-    npx prisma generate --schema=prisma/$DATABASE_PROVIDER-schema.prisma
+    npm run db:generate
     if [ $? -ne 0 ]; then
         echo "Prisma generate failed"
         exit 1

Dockerfile

@@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
 RUN apk update && \
     apk add git ffmpeg wget curl bash
 
-LABEL version="2.0.9-rc" description="Api to control whatsapp features through http requests." 
+LABEL version="2.0.9" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="contato@agenciadgcode.com"
 
@@ -18,6 +18,7 @@ COPY ./public ./public
 COPY ./prisma ./prisma
 COPY ./manager ./manager
 COPY ./.env.example ./.env
+COPY ./runWithProvider.js ./
 
 COPY ./Docker ./Docker
 
@@ -47,6 +48,7 @@ COPY --from=builder /evolution/manager ./manager
 COPY --from=builder /evolution/public ./public
 COPY --from=builder /evolution/.env ./.env
 COPY --from=builder /evolution/Docker ./Docker
+COPY --from=builder /evolution/runWithProvider.js ./runWithProvider.js
 
 ENV DOCKER_ENV=true
 

package.json

@@ -5,7 +5,7 @@
   "main": "./dist/main.js",
   "type": "commonjs",
   "scripts": {
-    "build": "tsup",
+    "build": "tsup src/main.ts --out-dir dist",
     "start": "tsnd -r tsconfig-paths/register --files --transpile-only ./src/main.ts",
     "start:prod": "node dist/main",
     "dev:server": "clear && tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",

prisma/mysql-migrations/20240813153900_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql

@@ -1,6 +1,5 @@
 /*
 Warnings:
-
 - You are about to alter the column `createdAt` on the `Chat` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
 - You are about to alter the column `updatedAt` on the `Chat` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
 - You are about to alter the column `createdAt` on the `Chatwoot` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
@@ -49,103 +48,138 @@
 - You are about to alter the column `createdAt` on the `Websocket` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
 - You are about to alter the column `updatedAt` on the `Websocket` table. The data in that column could be lost. The data in that column will be cast from `Timestamp(0)` to `Timestamp`.
 - A unique constraint covering the columns `[remoteJid,instanceId]` on the table `Contact` will be added. If there are existing duplicate values, this will fail.
-
 */
 -- AlterTable
-ALTER TABLE `Chat` ADD COLUMN `name` VARCHAR(100) NULL,
+ALTER TABLE `Chat`
+ADD COLUMN `name` VARCHAR(100) NULL,
 MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NULL;
 
 -- AlterTable
-ALTER TABLE `Chatwoot` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Chatwoot`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `Contact` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Contact`
-    MODIFY `updatedAt` TIMESTAMP NULL;
-
--- AlterTable
-ALTER TABLE `Dify` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `DifySession` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `DifySetting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Instance` MODIFY `disconnectionAt` TIMESTAMP NULL,
 MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NULL;
 
 -- AlterTable
-ALTER TABLE `Label` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Dify`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `Media` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `DifySession`
-
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
--- AlterTable
-ALTER TABLE `OpenaiBot` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `OpenaiCreds` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `DifySetting`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `OpenaiSession` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Instance`
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
+MODIFY `disconnectionAt` TIMESTAMP NULL,
-
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
--- AlterTable
-ALTER TABLE `OpenaiSetting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Proxy` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Rabbitmq` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Session` MODIFY `createdAt` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
-
--- AlterTable
-ALTER TABLE `Setting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Sqs` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Template` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-    MODIFY `updatedAt` TIMESTAMP NOT NULL;
-
--- AlterTable
-ALTER TABLE `Typebot` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NULL;
 
 -- AlterTable
-ALTER TABLE `TypebotSession` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Label`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `TypebotSetting` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `Media`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE `OpenaiBot`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `Webhook` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `OpenaiCreds`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
 -- AlterTable
-ALTER TABLE `Websocket` MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+ALTER TABLE `OpenaiSession`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
 MODIFY `updatedAt` TIMESTAMP NOT NULL;
 
+-- AlterTable
+ALTER TABLE `OpenaiSetting`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Proxy`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Rabbitmq`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Session`
+MODIFY `createdAt` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+-- AlterTable
+ALTER TABLE `Setting`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Sqs`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Template`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Typebot`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NULL;
+
+-- AlterTable
+ALTER TABLE `TypebotSession`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `TypebotSetting`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Webhook`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Websocket`
+MODIFY `createdAt` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+MODIFY `updatedAt` TIMESTAMP NOT NULL;
+
+-- Remove the duplicates
+DELETE c1
+FROM `Contact` c1
+    INNER JOIN (
+        SELECT MIN(id) as id
+        FROM `Contact`
+        GROUP BY
+            `remoteJid`, `instanceId`
+    ) c2 ON c1.`remoteJid` = c2.`remoteJid`
+    AND c1.`instanceId` = c2.`instanceId`
+    AND c1.id != c2.id;
+
 -- CreateIndex
 CREATE UNIQUE INDEX `Contact_remoteJid_instanceId_key` ON `Contact` (`remoteJid`, `instanceId`);

prisma/postgresql-migrations/20240811183328_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql

@@ -4,5 +4,14 @@
   - A unique constraint covering the columns `[remoteJid,instanceId]` on the table `Contact` will be added. If there are existing duplicate values, this will fail.
 
 */
+-- Remove the duplicates
+DELETE FROM "Contact"
+WHERE ctid NOT IN (
+  SELECT min(ctid)
+  FROM "Contact"
+  GROUP BY "remoteJid", "instanceId"
+);
+
+
 -- CreateIndex
 CREATE UNIQUE INDEX "Contact_remoteJid_instanceId_key" ON "Contact"("remoteJid", "instanceId");