Merge branch 'dev' into feat/user-application-post

Author: cherylli

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    env: 
+    env:
       MJ_APIKEY_PUBLIC: ${{ secrets.MJ_APIKEY_PUBLIC }}
       MJ_APIKEY_PRIVATE: ${{ secrets.MJ_APIKEY_PRIVATE }}
       DATABASE_URL: ${{ secrets.DATABASE_URL_TEST }}
@@ -38,7 +38,7 @@ jobs:
         run: |
           if [ ${{ github.event.pull_request.base.ref }} == "main" ]; then
             yarn test:unit
-          fi       
+          fi
 
       - name: Push latest schema to the test database
         run: npx prisma db push --accept-data-loss
@@ -47,4 +47,4 @@ jobs:
         run: |
           if [ ${{ github.event.pull_request.base.ref }} == "main" ]; then
             yarn test:e2e --testTimeout=300000
-          fi        
+          fi

README.md

@@ -79,6 +79,14 @@ $ yarn studio
 > [!TIP]
 > It is recommended to use `db push` to [prototype your schema](https://www.prisma.io/docs/orm/prisma-migrate/workflows/prototyping-your-schema)
 
+### Troubleshooting Prisma not detecting openssl
+  If you get this message after running any of the prisma command:
+```bash
+prisma:warn Prisma failed to detect the libssl/openssl version to use, and may not work as expected. Defaulting to "openssl-1.1.x".
+Please manually install OpenSSL and try installing Prisma again.
+```
+try running `yarn install` command to install all the dependencies in docker
+
 ## Running the app
 
 ```bash
@@ -153,6 +161,9 @@ Once the services are spun up, go to your docker desktop, chingu-dashboard-be co
 
 Using the container actions, select 'Open in terminal'.
 
+> [!IMPORTANT]
+> After spinning up the Docker services, run `yarn install`
+
 From here, type all the commands [above](#prismaStudio).
 
 ## PG Admin

dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/app
 

package.json

@@ -43,73 +43,75 @@
         "test": "yarn test:e2e --silent && yarn test:unit --silent"
     },
     "dependencies": {
-        "@casl/ability": "^6.7.2",
-        "@casl/prisma": "^1.5.0",
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.17.0",
-        "@nestjs/common": "^10.4.15",
-        "@nestjs/config": "^3.3.0",
-        "@nestjs/core": "^10.4.15",
-        "@nestjs/jwt": "^10.2.0",
-        "@nestjs/passport": "^10.0.3",
-        "@nestjs/platform-express": "^10.4.15",
-        "@nestjs/schedule": "^4.1.2",
-        "@nestjs/swagger": "^8.1.0",
-        "@prisma/client": "^5.22.0",
+        "@casl/ability": "^6.7.3",
+        "@casl/prisma": "1.5.1",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "^9.23.0",
+        "@nestjs/common": "^11.0.12",
+        "@nestjs/config": "^4.0.1",
+        "@nestjs/core": "^11.0.12",
+        "@nestjs/jwt": "^11.0.0",
+        "@nestjs/passport": "^11.0.5",
+        "@nestjs/platform-express": "^11.0.12",
+        "@nestjs/schedule": "^5.0.1",
+        "@nestjs/swagger": "^11.0.7",
+        "@prisma/client": "6",
         "bcrypt": "^5.1.1",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.1",
         "cookie-parser": "^1.4.7",
         "dotenv": "^16.4.7",
-        "globals": "^15.13.0",
-        "lint-staged": "^15.2.11",
+        "express": "4.0.0",
+        "globals": "^16.0.0",
+        "lint-staged": "^15.5.0",
         "morgan": "^1.10.0",
-        "node-mailjet": "^6.0.6",
+        "node-mailjet": "^6.0.8",
         "passport": "^0.7.0",
         "passport-discord": "^0.1.4",
         "passport-jwt": "^4.0.1",
         "passport-local": "^1.0.0",
         "reflect-metadata": "^0.2.2",
-        "rxjs": "^7.8.1",
-        "swagger-ui-express": "^5.0.1"
+        "rxjs": "^7.8.2",
+        "swagger-ui-express": "^5.0.1",
+        "webpack": "^5.0.0"
     },
     "devDependencies": {
-        "@nestjs/cli": "^10.4.9",
-        "@nestjs/schematics": "^10.2.3",
-        "@nestjs/testing": "^10.4.15",
+        "@nestjs/cli": "^11.0.5",
+        "@nestjs/schematics": "^11.0.2",
+        "@nestjs/testing": "^11.0.12",
         "@types/bcrypt": "^5.0.2",
         "@types/cookie-parser": "^1.4.8",
-        "@types/express": "^5.0.0",
+        "@types/express": "^5.0.1",
         "@types/jest": "^29.5.14",
         "@types/morgan": "^1.9.9",
-        "@types/node": "^22.10.2",
-        "@types/node-mailjet": "^3.3.12",
+        "@types/node": "^22.13.11",
+        "@types/node-mailjet": "^4.0.0",
         "@types/passport-discord": "^0.1.14",
         "@types/passport-jwt": "^4.0.1",
         "@types/passport-local": "^1.0.38",
         "@types/supertest": "^6.0.2",
-        "@typescript-eslint/eslint-plugin": "^8.18.1",
-        "@typescript-eslint/parser": "^8.18.1",
+        "@typescript-eslint/eslint-plugin": "^8.27.0",
+        "@typescript-eslint/parser": "^8.27.0",
         "cross-env": "^7.0.3",
-        "dotenv-cli": "^7.4.4",
-        "eslint": "^8.57.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-jest-extended": "^2.4.0",
-        "eslint-plugin-prettier": "^5.2.1",
+        "dotenv-cli": "^8.0.0",
+        "eslint": "^9.23.0",
+        "eslint-config-prettier": "^10.1.1",
+        "eslint-plugin-jest-extended": "^3.0.0",
+        "eslint-plugin-prettier": "^5.2.3",
         "husky": "^9.1.7",
         "jest": "^29.7.0",
         "jest-extended": "^4.0.2",
         "jest-mock-extended": "^3.0.7",
         "joi": "^17.13.3",
-        "prettier": "^3.4.2",
-        "prisma": "5.22.0",
+        "prettier": "^3.5.3",
+        "prisma": "6",
         "source-map-support": "^0.5.21",
-        "supertest": "^7.0.0",
-        "ts-jest": "^29.2.5",
-        "ts-loader": "9.4.4",
+        "supertest": "^7.1.0",
+        "ts-jest": "^29.2.6",
+        "ts-loader": "9.5.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.7.2"
+        "typescript": "^5.8.2"
     },
     "jest": {
         "moduleFileExtensions": [

src/ability/conditions/ideations.ability.ts

@@ -10,14 +10,16 @@ export const manageOwnIdeationById = async (
     ideationId: number,
 ) => {
     if (user.roles?.includes("admin")) return;
+
     const ideation = await prisma.projectIdea.findUnique({
-        where: {
-            id: ideationId,
-        },
+        where: { id: ideationId },
+        select: { voyageTeamMemberId: true },
     });
+
     if (!ideation) {
         throw new NotFoundException(`Ideation (id:${ideationId}) not found`);
     }
+
     // ideation is not linked to any members, this should never happen unless the user gets deleted
     // or removed from the team?
     // in this case we should let the rest of the team manage it
@@ -26,6 +28,7 @@ export const manageOwnIdeationById = async (
             `Ideation access control: You do not have sufficient permission to access this resource.`,
         );
     }
+
     if (
         !user.voyageTeams
             .map((vt) => vt.memberId)

src/ideations/ideations.module.ts

@@ -2,6 +2,7 @@ import { Module } from "@nestjs/common";
 import { IdeationsService } from "./ideations.service";
 import { IdeationsController } from "./ideations.controller";
 import { PrismaModule } from "../prisma/prisma.module";
+
 @Module({
     controllers: [IdeationsController],
     providers: [IdeationsService],

src/ideations/ideations.service.ts

@@ -122,23 +122,25 @@ export class IdeationsService {
         // teamId: number,
         updateIdeationDto: UpdateIdeationDto,
     ) {
+        // First check if user has permission to update this ideation
+        await manageOwnIdeationById(req.user, ideationId);
+
+        // Then validate the update data
+        if (!updateIdeationDto) {
+            throw new BadRequestException("Update data is required");
+        }
+
         const { title, description, vision } = updateIdeationDto;
 
-        await manageOwnIdeationById(req.user, ideationId);
+        // await manageOwnIdeationById(req.user, ideationId);
 
         // TODO: might need to check if user can update it
         //  (they should only be able to update it when they have the only vote)
         try {
             //only allow the user that created the idea to edit it
             return this.prisma.projectIdea.update({
-                where: {
-                    id: ideationId,
-                },
-                data: {
-                    title,
-                    description,
-                    vision,
-                },
+                where: { id: ideationId },
+                data: { title, description, vision },
             });
         } catch (e) {
             throw e;