Merge branch 'feature/multitenancy' into #2313-Set-DR-Status-Endpoint

src/backend/src/prisma/seed-data/users.seed.ts

@@ -8,6 +8,9 @@ import { RoleEnum } from 'shared';
 import prisma from '../prisma';
 import { getUserQueryArgs } from '../../prisma-query-args/user.query-args';
 
+/** Gets the current content of the .env file */
+const currentEnv = require('dotenv').config().parsed;
+
 const thomasEmrax: Prisma.UserCreateInput = {
   firstName: 'Thomas',
   lastName: 'Emrax',
@@ -17,7 +20,7 @@ const thomasEmrax: Prisma.UserCreateInput = {
   userSettings: {
     create: {
       defaultTheme: Theme.DARK,
-      slackId: 'emrax'
+      slackId: currentEnv && currentEnv.SLACK_ID ? currentEnv.SLACK_ID : 'emrax'
     }
   },
   userSecureSettings: {
@@ -776,7 +779,7 @@ const regina: Prisma.UserCreateInput = {
   userSettings: {
     create: {
       defaultTheme: Theme.DARK,
-      slackId: 'Queen Regina'
+      slackId: currentEnv && currentEnv.SLACK_ID ? currentEnv.SLACK_ID : 'Queen Regina'
     }
   }
 };

src/backend/src/prisma/seed.ts

@@ -50,6 +50,11 @@ const performSeed: () => Promise<void> = async () => {
     include: { userSettings: true, userSecureSettings: true }
   });
 
+  const regina = await prisma.user.create({
+    data: dbSeedAllUsers.regina,
+    include: { userSettings: true, userSecureSettings: true }
+  });
+
   const ner = await prisma.organization.create({
     data: {
       name: 'NER',
@@ -173,7 +178,6 @@ const performSeed: () => Promise<void> = async () => {
   const francis = await createUser(dbSeedAllUsers.francis, RoleEnum.LEADERSHIP, organizationId);
   const victorPerkins = await createUser(dbSeedAllUsers.victorPerkins, RoleEnum.LEADERSHIP, organizationId);
   const kingJulian = await createUser(dbSeedAllUsers.kingJulian, RoleEnum.LEADERSHIP, organizationId);
-  const regina = await createUser(dbSeedAllUsers.regina, RoleEnum.LEADERSHIP, organizationId);
   const gretchen = await createUser(dbSeedAllUsers.gretchen, RoleEnum.LEADERSHIP, organizationId);
   const karen = await createUser(dbSeedAllUsers.karen, RoleEnum.LEADERSHIP, organizationId);
   const janis = await createUser(dbSeedAllUsers.janis, RoleEnum.LEADERSHIP, organizationId);
@@ -274,6 +278,7 @@ const performSeed: () => Promise<void> = async () => {
   /** If the .env file exists, set the FINANCE_TEAM_ID */
   if (currentEnv) {
     currentEnv.FINANCE_TEAM_ID = financeTeam.teamId;
+
     /** Write the new .env file */
     let stringifiedEnv = '';
     Object.keys(currentEnv).forEach((key) => {
@@ -606,7 +611,7 @@ const performSeed: () => Promise<void> = async () => {
   const { projectWbsNumber: project7WbsNumber, projectId: project7Id } = await seedProject(
     lexLuther,
     changeRequest1.crId,
-    1,
+    0,
     'Laser Cannon Prototype',
     'Develop a prototype of a laser cannon for the Justice League',
     [justiceLeague.teamId],
@@ -634,7 +639,7 @@ const performSeed: () => Promise<void> = async () => {
   const { projectWbsNumber: project8WbsNumber, projectId: project8Id } = await seedProject(
     ryanGiggs,
     changeRequest1.crId,
-    1,
+    0,
     'Stadium Renovation',
     `Renovate the team's stadium to improve fan experience`,
     [ravens.teamId],
@@ -662,7 +667,7 @@ const performSeed: () => Promise<void> = async () => {
   const { projectWbsNumber: project9WbsNumber, projectId: project9Id } = await seedProject(
     glen,
     changeRequest1.crId,
-    1,
+    0,
     'Community Outreach Program',
     'Initiate a community outreach program to engage with local schools',
     [slackBotTeam.teamId],

src/backend/src/services/work-packages.services.ts

@@ -166,7 +166,6 @@ export default class WorkPackagesService {
     if (await userHasPermission(user.userId, organizationId, isGuest))
       throw new AccessDeniedGuestException('create work packages');
 
-    console.log(descriptionBullets);
     const changeRequest = await validateChangeRequestAccepted(crId);
 
     const wbsElem = await prisma.wBS_Element.findUnique({
@@ -402,8 +401,6 @@ export default class WorkPackagesService {
       });
     }
 
-    console.log(changes.addedDescriptionBullets);
-
     // Add the new description bullets to the workpackage
     await addRawDescriptionBullets(
       changes.addedDescriptionBullets,

src/frontend/src/apis/work-packages.api.ts

@@ -67,7 +67,6 @@ export const createSingleWorkPackage = (payload: WorkPackageApiInputs) => {
  * @returns Promise that will resolve to either a success status code or a fail status code.
  */
 export const editWorkPackage = (payload: WorkPackageApiInputs) => {
-  console.log(payload);
   return axios.post<{ message: string }>(apiUrls.workPackagesEdit(), {
     ...payload
   });

src/frontend/src/hooks/users.hooks.ts

@@ -70,7 +70,6 @@ export const useSingleUser = (id: number) => {
 export const useLogUserIn = () => {
   return useMutation<AuthenticatedUser, Error, string>(['users', 'login'], async (id_token: string) => {
     const { data } = await logUserIn(id_token);
-    console.log(data);
     return data;
   });
 };

src/frontend/src/pages/LoginPage/Login.tsx

@@ -63,7 +63,6 @@ const Login = () => {
     }
     if (authedUser.organizations.length > 0) {
       const defaultOrganization = authedUser.organizations[0];
-      console.log(defaultOrganization);
       organizationContext.selectOrganization(defaultOrganization);
     }
     redirectAfterLogin();

src/frontend/src/pages/WorkPackageDetailPage/WorkPackageViewContainer/ScopeTab.tsx

@@ -16,8 +16,6 @@ const ScopeTab = ({ workPackage }: { workPackage: WorkPackage }) => {
     descriptoinBulletsSplitByType.get(bullet.type)!.push(bullet);
   }
 
-  console.log(workPackage.descriptionBullets);
-
   return (
     <>
       {Array.from(descriptoinBulletsSplitByType.entries()).map(([type, bullets]) => (