Merge branch 'dev' into feature/casl-permission-voyage-sprints

chingu-x · Sep 1, 2024 · e687ebc · e687ebc
2 parents 8379de3 + 6d01dfa
commit e687ebc
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -107,6 +107,7 @@ Another example [here](https://co-pilot.dev/changelog)
 - 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))
 
 ### Removed
 

diff --git a/prisma/migrations/20240828005752_mark_oauthprovider_name_unique/migration.sql b/prisma/migrations/20240828005752_mark_oauthprovider_name_unique/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[name]` on the table `OAuthProvider` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "OAuthProvider_name_key" ON "OAuthProvider"("name");
diff --git a/prisma/production-seed/users.ts b/prisma/production-seed/users.ts
@@ -1,6 +1,7 @@
 import { prisma } from "../seed/prisma-client";
 import { hashPassword } from "../../src/utils/auth";
 import { getRoleId } from "../seed/users";
+import { generateGravatarUrl } from "../seed/utils";
 
 export const populateUsersProd = async () => {
     const roles = await prisma.role.findMany({});
@@ -13,7 +14,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Admin",
             lastName: "Surname",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("admin@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -34,7 +35,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Jim",
             lastName: "PO",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("jim@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -54,7 +55,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Razieh",
             lastName: "PO",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("razieh@example.com"),
             timezone: "Europe/Madrid",
             countryCode: "ES",
         },
@@ -74,7 +75,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Mladen",
             lastName: "PO",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("mladen@example.com"),
             timezone: "Europe/Madrid",
             countryCode: "ES",
         },
@@ -96,7 +97,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Eury",
             lastName: "Design",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("eury@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -116,7 +117,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Joe",
             lastName: "Design",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("joe@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -136,7 +137,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Joseph",
             lastName: "Design",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("joseph@example.com"),
             timezone: "America/Lima",
             countryCode: "PE",
         },
@@ -156,7 +157,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Austin",
             lastName: "Design",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("austin@example.com"),
             timezone: "US/Pacific",
             countryCode: "US",
         },
@@ -178,7 +179,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Dan",
             lastName: "Frontend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("dan@example.com"),
             timezone: "US/Eastern",
             countryCode: "US",
         },
@@ -198,7 +199,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Jane",
             lastName: "Frontend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("jane@example.com"),
             timezone: "Asia/Tbilisi",
             countryCode: "GE",
         },
@@ -218,7 +219,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Timothy",
             lastName: "Frontend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("timothy@example.com"),
             timezone: "Europe/Rome",
             countryCode: "IT",
         },
@@ -238,7 +239,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Winnie",
             lastName: "Frontend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("winnie@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -260,7 +261,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Cheryl",
             lastName: "Backend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("cheryl@example.com"),
             timezone: "Australia/Melbourne",
             countryCode: "AU",
         },
@@ -280,7 +281,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Curt",
             lastName: "Backend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("curt@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -300,7 +301,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Josh",
             lastName: "Backend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("josh@example.com"),
             timezone: "US/Pacific",
             countryCode: "US",
         },
@@ -320,7 +321,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Tim",
             lastName: "Backend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("tim@example.com"),
             timezone: "US/Central",
             countryCode: "US",
         },
@@ -340,7 +341,7 @@ export const populateUsersProd = async () => {
             emailVerified: true,
             firstName: "Arman",
             lastName: "Backend",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("arman@example.com"),
             timezone: "Asia/Kolkata",
             countryCode: "IN",
         },

diff --git a/prisma/schema/user.prisma b/prisma/schema/user.prisma
@@ -65,7 +65,7 @@ model UserRole {
 
 model OAuthProvider {
   id   Int    @id @default(autoincrement())
-  name String
+  name String @unique
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt

diff --git a/prisma/seed/forms/checkinform.ts b/prisma/seed/forms/checkinform.ts
@@ -235,7 +235,7 @@ export const populateCheckinForm = async () => {
                             },
                         },
                         text: "Is there anything else you'd like to tell us about your Voyage Guide?",
-                        answerRequired: true,
+                        answerRequired: false,
                     },
                     {
                         order: 12,

diff --git a/prisma/seed/users.ts b/prisma/seed/users.ts
@@ -1,5 +1,6 @@
 import { hashPassword } from "../../src/utils/auth";
 import { prisma } from "./prisma-client";
+import { generateGravatarUrl } from "./utils";
 
 export const getRoleId = (roles, name) => {
     return roles.filter((role) => role.name == name)[0].id;
@@ -15,14 +16,30 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Jessica",
             lastName: "Williamson",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("jessica.williamson@gmail.com"),
             timezone: "Australia/Melbourne",
             countryCode: "AU",
             gender: {
                 connect: {
                     abbreviation: "F",
                 },
             },
+            oAuthProfiles: {
+                create: {
+                    providerUserId: "1234567",
+                    providerUsername: "jessica-discord",
+                    provider: {
+                        connectOrCreate: {
+                            where: {
+                                name: "discord",
+                            },
+                            create: {
+                                name: "discord",
+                            },
+                        },
+                    },
+                },
+            },
         },
     });
 
@@ -47,7 +64,7 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Larry",
             lastName: "Castro",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=monsterid&r=x",
+            avatar: generateGravatarUrl("l.castro@outlook.com"),
             timezone: "America/Chicago",
             comment: "Member seems to be inactive",
             countryCode: "US",
@@ -80,7 +97,7 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Leonarda",
             lastName: "Rowe",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=identicon&r=x",
+            avatar: generateGravatarUrl("leo.rowe@outlook.com"),
             timezone: "America/Los_Angeles",
             comment: "This is a random admin comment",
             countryCode: "US",
@@ -106,7 +123,7 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Joso",
             lastName: "Mađar",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=wavatar&r=x",
+            avatar: generateGravatarUrl("JosoMadar@dayrep.com"),
             timezone: "Europe/Zagreb",
             comment: "This is a random admin comment",
             countryCode: "HR",
@@ -127,7 +144,7 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Dan",
             lastName: "Ko",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=wavatar&r=x",
+            avatar: generateGravatarUrl("dan@random.com"),
             timezone: "America/Los_Angeles",
             comment: "No comment",
             countryCode: "US",
@@ -148,7 +165,7 @@ export const populateUsers = async () => {
             emailVerified: true,
             firstName: "Not in a voyage",
             lastName: "Voyage",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=wavatar&r=x",
+            avatar: generateGravatarUrl("not_in_voyage@example.com"),
             timezone: "America/New_York",
             comment:
                 "This user is not in a voyage - does not have the 'voyager' role",
@@ -163,7 +180,7 @@ export const populateUsers = async () => {
             emailVerified: false,
             firstName: "Yoshi",
             lastName: "Amano",
-            avatar: "https://gravatar.com/avatar/3bfaef00e02a22f99e17c66e7a9fdd31?s=400&d=robohash&r=x",
+            avatar: generateGravatarUrl("yoshi@gmail.com"),
             timezone: "Australia/Melbourne",
             countryCode: "AU",
             gender: {

diff --git a/prisma/seed/utils/index.ts b/prisma/seed/utils/index.ts
@@ -1,4 +1,5 @@
 import { prisma } from "../prisma-client";
+import * as crypto from "crypto";
 
 export const addDays = (date, days: number) => {
     const newDate = new Date(date);
@@ -26,3 +27,10 @@ export const getRandomDateDuringSprint = async (sprintId) => {
     });
     return addDays(sprint?.startDate, Math.floor(Math.random() * 6));
 };
+
+export const generateGravatarUrl = (email: string = "noemail@example.com") => {
+    const themes = ["identicon", "monsterid", "wavatar", "retro", "robohash"];
+    const hash = crypto.createHash("sha256").update(email).digest("hex");
+    return `https://gravatar.com/avatar/${hash}?s=200&r=g&d=${themes[Math.floor(Math.random() * themes.length)]}
+`;
+};