[Merge] develop에서 main 브랜치 병합

package.json

@@ -30,16 +30,21 @@
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/platform-socket.io": "^10.4.15",
-    "@nestjs/swagger": "^8.1.0",
+    "@nestjs/swagger": "^8.1.1",
     "@prisma/client": "^6.1.0",
     "axios": "^1.7.9",
     "bcrypt": "^5.1.1",
+    "cheerio": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cookie-parser": "^1.4.7",
+    "date-fns": "^4.1.0",
+    "dayjs": "^1.11.13",
     "dotenv": "^16.4.7",
+    "file-type": "^16.5.4",
     "ioredis": "^5.4.2",
     "jsonwebtoken": "^9.0.2",
+    "mime": "^4.0.6",
     "passport": "^0.7.0",
     "passport-github": "^1.1.0",
     "passport-github2": "^0.1.12",
@@ -59,6 +64,7 @@
     "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.2",
+    "@types/multer": "^1.4.12",
     "@types/node": "^20.3.1",
     "@types/passport-github2": "^1.2.9",
     "@types/passport-google-oauth20": "^2.0.16",

prisma/migrations/20250110074825_chat_logic_fixed/migration.sql

@@ -0,0 +1,37 @@
+/*
+  Warnings:
+
+  - The primary key for the `Channel` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to alter the column `id` on the `Channel` table. The data in that column could be lost. The data in that column will be cast from `VarChar(191)` to `Int`.
+  - You are about to alter the column `channel_id` on the `Channel_users` table. The data in that column could be lost. The data in that column will be cast from `VarChar(191)` to `Int`.
+  - You are about to alter the column `channel_id` on the `Message` table. The data in that column could be lost. The data in that column will be cast from `VarChar(191)` to `Int`.
+
+*/
+-- DropForeignKey
+ALTER TABLE `Channel_users` DROP FOREIGN KEY `Channel_users_channel_id_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `Message` DROP FOREIGN KEY `Message_channel_id_fkey`;
+
+-- DropIndex
+DROP INDEX `Channel_users_channel_id_fkey` ON `Channel_users`;
+
+-- DropIndex
+DROP INDEX `Message_channel_id_fkey` ON `Message`;
+
+-- AlterTable
+ALTER TABLE `Channel` DROP PRIMARY KEY,
+    MODIFY `id` INTEGER NOT NULL AUTO_INCREMENT,
+    ADD PRIMARY KEY (`id`);
+
+-- AlterTable
+ALTER TABLE `Channel_users` MODIFY `channel_id` INTEGER NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Message` MODIFY `channel_id` INTEGER NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE `Channel_users` ADD CONSTRAINT `Channel_users_channel_id_fkey` FOREIGN KEY (`channel_id`) REFERENCES `Channel`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `Message` ADD CONSTRAINT `Message_channel_id_fkey` FOREIGN KEY (`channel_id`) REFERENCES `Channel`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250114034707_online_users_table/migration.sql

@@ -0,0 +1,11 @@
+-- AlterTable
+ALTER TABLE `User` ADD COLUMN `password` VARCHAR(191) NULL;
+
+-- CreateTable
+CREATE TABLE `online_users` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `client_id` VARCHAR(191) NOT NULL,
+    `user_id` INTEGER NOT NULL,
+
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;