Merge pull request #203 from chingu-x/dev

End of sprint 28 merge to main

Author: cherylli

CHANGELOG.md

@@ -16,6 +16,29 @@ Another example [here](https://co-pilot.dev/changelog)
 
 ### Removed
 
+
+## [v1.0.1-alpha]
+
+### Added
+- Add units tests for the teams controller & services([#189](https://github.com/chingu-x/chingu-dashboard-be/pull/189))
+- Add discord oauth and e2e test ([#194](https://github.com/chingu-x/chingu-dashboard-be/pull/194))
+- Add morgan middleware for request logging with custom logger ([#200](https://github.com/chingu-x/chingu-dashboard-be/pull/200))
+- Add CASL permissions for Team Sprint endpoint ([#193](https://github.com/chingu-x/chingu-dashboard-be/pull/193))
+- Add units tests for the teams resource controller & services([#201](https://github.com/chingu-x/chingu-dashboard-be/pull/201))
+
+### Changed
+- updated changelog ([#195](https://github.com/chingu-x/chingu-dashboard-be/pull/195))
+- Update accepted localhost port and docker compose file for a custom network setup ([#199](https://github.com/chingu-x/chingu-dashboard-be/pull/199))
+
+### Fixed
+- Fix seed data for alpha test (check in form question changes, gravatar) ([#190](https://github.com/chingu-x/chingu-dashboard-be/pull/190))
+- revised 2 checkin questions for alpha test ([#192](https://github.com/chingu-x/chingu-dashboard-be/pull/192))
+- Fix seed checkin form data for PO and SM , and voyage-role for team 6 ([#196](https://github.com/chingu-x/chingu-dashboard-be/pull/196))
+- Bug add check for team id in place memberId ([#197](https://github.com/chingu-x/chingu-dashboard-be/pull/197))
+- Update check-in form question ids validation (`checkQuestionsInFormById`) to accept an array of form titles ([#198](https://github.com/chingu-x/chingu-dashboard-be/pull/198))
+
+### Removed
+
 ## [v1.0.0-alpha]
 
 ### Added
@@ -60,10 +83,11 @@ Another example [here](https://co-pilot.dev/changelog)
 - Add units tests for the users controller & services([#179](https://github.com/chingu-x/chingu-dashboard-be/pull/178))
 -  Add CASL permissions for Team features endpoint ([#184](https://github.com/chingu-x/chingu-dashboard-be/pull/184))
 - Add production seed for alpha test ([#185](https://github.com/chingu-x/chingu-dashboard-be/pull/185))
+- Add types and validation to env variables ([#187](https://github.com/chingu-x/chingu-dashboard-be/pull/187))
+
 
 
 
-- Add units tests for the teams controller & services([#189](https://github.com/chingu-x/chingu-dashboard-be/pull/189))
 
 ### Changed
 
@@ -105,8 +129,9 @@ Another example [here](https://co-pilot.dev/changelog)
 - Fix bug with reading roles after reseeding causes the db to not recognize the tokens stored by the user's browser ([#134](https://github.com/chingu-x/chingu-dashboard-be/pull/134))
 - Fix form responses giving error and not inserting values when the boolean value is false ([#156](https://github.com/chingu-x/chingu-dashboard-be/pull/156))
 - Fix a bug for check on voyageTeamMemberId ([#159](https://github.com/chingu-x/chingu-dashboard-be/pull/159))
-- Fix users unit test failing due to a schema change
-- Fix seed data for alpha test (check in form question changes, gravatar) ([#190](https://github.com/chingu-x/chingu-dashboard-be/pull/190))
+- Fix users unit test failing due to a schema change ([#182](https://github.com/chingu-x/chingu-dashboard-be/pull/182))
+
+
 
 ### Removed
 

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   postgres:
     container_name: postgres
@@ -57,7 +56,12 @@ services:
       - /usr/src/app/node_modules
       - .:/usr/src/app
     command: ['yarn', 'start:dev']
+
 volumes:
   pgdata:
   pgdata-test:
   pgadmin-data:
+
+networks:
+  default:
+    name: chingu-dashboard-be

package.json

@@ -14,7 +14,7 @@
         "start:prod": "node dist/main",
         "docker:down": "docker compose down",
         "docker:clean": "docker compose down -v --remove-orphans",
-        "docker": "docker-compose up -d",
+        "docker": "docker compose up -d",
         "migrate": "npx prisma migrate dev",
         "migrate:test": "dotenv -e ./.env.test npx prisma migrate dev",
         "migrate:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public --  npx prisma migrate dev",
@@ -46,7 +46,7 @@
         "@casl/ability": "^6.7.1",
         "@casl/prisma": "^1.4.1",
         "@nestjs/common": "^10.0.0",
-        "@nestjs/config": "^3.0.1",
+        "@nestjs/config": "^3.2.3",
         "@nestjs/core": "^10.0.0",
         "@nestjs/jwt": "^10.1.1",
         "@nestjs/passport": "^10.0.2",
@@ -60,6 +60,7 @@
         "cookie-parser": "^1.4.6",
         "dotenv": "^16.3.1",
         "lint-staged": "^15.1.0",
+        "morgan": "^1.10.0",
         "node-mailjet": "^6.0.4",
         "passport": "^0.6.0",
         "passport-discord": "^0.1.4",
@@ -77,7 +78,9 @@
         "@types/cookie-parser": "^1.4.6",
         "@types/express": "^4.17.17",
         "@types/jest": "^29.5.2",
+        "@types/morgan": "^1.9.9",
         "@types/node": "^20.3.1",
+        "@types/node-mailjet": "^3.3.12",
         "@types/passport-discord": "^0.1.13",
         "@types/passport-jwt": "^3.0.11",
         "@types/passport-local": "^1.0.37",
@@ -93,6 +96,7 @@
         "jest": "^29.5.0",
         "jest-extended": "^4.0.2",
         "jest-mock-extended": "^3.0.7",
+        "joi": "^17.13.3",
         "prettier": "^3.0.0",
         "prisma": "^5.16.1",
         "source-map-support": "^0.5.21",

prisma/production-seed/users.ts

@@ -1,5 +1,5 @@
 import { prisma } from "../seed/prisma-client";
-import { hashPassword } from "../../src/utils/auth";
+import { hashPassword } from "../../src/global/auth/utils";
 import { getRoleId } from "../seed/users";
 import { generateGravatarUrl } from "../seed/utils";
 

prisma/seed/data/oauth-providers.ts

@@ -0,0 +1,5 @@
+export default [
+    {
+        name: "discord",
+    },
+];

prisma/seed/forms/checkinformPO.ts

@@ -16,7 +16,7 @@ export const populateCheckinFormPO = async () => {
             questions: {
                 create: [
                     {
-                        order: 1,
+                        order: 101,
                         inputType: {
                             connect: {
                                 name: "checkbox",
@@ -73,7 +73,7 @@ export const populateCheckinFormPO = async () => {
                         },
                     },
                     {
-                        order: 2,
+                        order: 102,
                         inputType: {
                             connect: {
                                 name: "text",

prisma/seed/forms/checkinformSM.ts

@@ -16,7 +16,7 @@ export const populateCheckinFormSM = async () => {
             questions: {
                 create: [
                     {
-                        order: 1,
+                        order: 201,
                         inputType: {
                             connect: {
                                 name: "boolean",
@@ -26,7 +26,7 @@ export const populateCheckinFormSM = async () => {
                         answerRequired: true,
                     },
                     {
-                        order: 2,
+                        order: 202,
                         inputType: {
                             connect: {
                                 name: "boolean",
@@ -36,7 +36,7 @@ export const populateCheckinFormSM = async () => {
                         answerRequired: true,
                     },
                     {
-                        order: 3,
+                        order: 203,
                         inputType: {
                             connect: {
                                 name: "boolean",
@@ -46,7 +46,7 @@ export const populateCheckinFormSM = async () => {
                         answerRequired: true,
                     },
                     {
-                        order: 4,
+                        order: 204,
                         inputType: {
                             connect: {
                                 name: "text",

prisma/seed/tables.ts

@@ -11,6 +11,7 @@ import InputTypes from "./data/input-types";
 import OptionGroups from "./data/option-groups";
 import Roles from "./data/roles";
 import { prisma } from "./prisma-client";
+import OauthProviders from "./data/oauth-providers";
 
 const populateTable = async (tableName: string, data) => {
     await prisma[tableName].createMany({
@@ -19,6 +20,7 @@ const populateTable = async (tableName: string, data) => {
     console.log(`${tableName} table populated.`);
 };
 
+// These are basic data table that will be used in both dev and prod
 export const populateTables = async () => {
     await populateTable("tier", Tiers);
     await populateTable("gender", Genders);
@@ -30,4 +32,5 @@ export const populateTables = async () => {
     await populateTable("formType", FormTypes);
     await populateTable("inputType", InputTypes);
     await populateTable("optionGroup", OptionGroups);
+    await populateTable("oAuthProvider", OauthProviders);
 };

prisma/seed/users.ts

@@ -1,4 +1,4 @@
-import { hashPassword } from "../../src/utils/auth";
+import { hashPassword } from "../../src/global/auth/utils";
 import { prisma } from "./prisma-client";
 import { generateGravatarUrl } from "./utils";
 

prisma/seed/voyage-teams.ts

@@ -487,7 +487,7 @@ export const populateVoyageTeams = async () => {
                         },
                         voyageRole: {
                             connect: {
-                                name: voyageRoles[2].name,
+                                name: voyageRoles[1].name,
                             },
                         },
                         status: {