fix: migrations

DavidsonGomes · DavidsonGomes · commit 975f41d58ed4 · 2024-08-15T13:13:08.000-03:00
diff --git a/CHANGELOG.md b/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)
 
diff --git a/Docker/scripts/deploy_database.sh b/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
-    cp -r ./prisma/$DATABASE_PROVIDER-migrations ./prisma/migrations
-    npx prisma migrate deploy --schema ./prisma/$DATABASE_PROVIDER-schema.prisma
+    # rm -rf ./prisma/migrations
+    # cp -r ./prisma/$DATABASE_PROVIDER-migrations ./prisma/migrations
+    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
diff --git a/Docker/scripts/generate_database.sh b/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
diff --git a/Dockerfile b/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
 
diff --git a/package.json b/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",
diff --git a/prisma/mysql-migrations/20240813153900_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql b/prisma/mysql-migrations/20240813153900_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql
diff --git a/prisma/postgresql-migrations/20240811183328_add_unique_index_for_remoted_jid_and_instance_in_contacts/migration.sql b/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");
