getAllUsers improvements

Author: walker-sean

src/backend/custom.d.ts

@@ -1,9 +1,10 @@
-import { Organization, User as PrismaUser } from '@prisma/client';
+import { Organization } from '@prisma/client';
+import { User as SharedUser } from 'shared';
 
 declare global {
   namespace Express {
     export interface Request {
-      currentUser: PrismaUser;
+      currentUser: SharedUser;
       organization: Organization;
     }
   }

src/backend/src/controllers/users.controllers.ts

@@ -3,9 +3,19 @@ import UsersService from '../services/users.services';
 import { AccessDeniedException } from '../utils/errors.utils';
 import { Task } from 'shared';
 export default class UsersController {
-  static async getAllUsers(_req: Request, res: Response, next: NextFunction) {
+  static async getAllUsers(req: Request, res: Response, next: NextFunction) {
     try {
-      const users = await UsersService.getAllUsers();
+      const users = await UsersService.getAllUsers(req.organization.organizationId);
+
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllOrganizationUsers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const users = await UsersService.getAllUsers(req.organization.organizationId);
 
       res.status(200).json(users);
     } catch (error: unknown) {
@@ -209,4 +219,16 @@ export default class UsersController {
       next(error);
     }
   }
+
+  static async getManyUsersWithScheduleSettings(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userIds } = req.body;
+
+      const users = await UsersService.getManyUsersWithScheduleSettings(userIds, req.organization);
+
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/prisma-query-args/user.query-args.ts

@@ -9,13 +9,12 @@ export type UserScheduleSettingsQueryArgs = ReturnType<typeof getUserScheduleSet
 // DO NOT CALL ANY OTHER QUERY ARGS FROM HERE TO AVOID CIRCULAR DEPENDENCIES
 export const getUserQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.UserDefaultArgs>()({
-    include: {
-      roles: {
-        where: {
-          organizationId
-        }
-      },
-      organizations: true
+    select: {
+      roles: { where: { organizationId } },
+      userId: true,
+      firstName: true,
+      lastName: true,
+      email: true
     }
   });
 

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

@@ -3,8 +3,8 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { Organization, User } from '@prisma/client';
-import { DescriptionBulletPreview, LinkCreateArgs, WbsNumber } from 'shared';
+import { Organization } from '@prisma/client';
+import { DescriptionBulletPreview, LinkCreateArgs, WbsNumber, User } from 'shared';
 import ProjectsService from '../../services/projects.services';
 
 /**

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

@@ -1,5 +1,6 @@
-import { Graph_Display_Type, Graph_Type, Measure, Organization, User } from '@prisma/client';
+import { Graph_Display_Type, Graph_Type, Measure, Organization } from '@prisma/client';
 import StatisticsService from '../../services/statistics.services';
+import { User } from 'shared';
 
 export const seedGraph = async (
   startDate: Date | null,

src/backend/src/prisma/seed-data/work-packages.seed.ts

@@ -3,8 +3,8 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { Organization, User } from '@prisma/client';
-import { DescriptionBulletPreview, WbsElementStatus, WbsNumber, WorkPackage } from 'shared';
+import { Organization } from '@prisma/client';
+import { DescriptionBulletPreview, WbsElementStatus, WbsNumber, WorkPackage, User } from 'shared';
 import { WorkPackageStage } from 'shared';
 import WorkPackagesService from '../../services/work-packages.services';
 

src/backend/src/prisma/seed.ts

@@ -50,6 +50,7 @@ import AnnouncementService from '../services/announcement.services';
 import OnboardingServices from '../services/onboarding.services';
 import { dbSeedAllParts, dbSeedAllPartTags } from './seed-data/parts.seed';
 import FinanceServices from '../services/finance.services';
+import { getUserQueryArgs } from '../prisma-query-args/user.query-args';
 
 const prisma = new PrismaClient();
 
@@ -112,7 +113,7 @@ export const CreatePartReviewFAQ = async (
 const performSeed: () => Promise<void> = async () => {
   const thomasEmrax = await prisma.user.create({
     data: dbSeedAllUsers.thomasEmrax,
-    include: { userSettings: true, userSecureSettings: true }
+    include: { userSettings: true, userSecureSettings: true, roles: true }
   });
 
   const ner = await prisma.organization.create({

src/backend/src/routes/users.routes.ts

@@ -7,6 +7,7 @@ import { isRole, nonEmptyString, intMinZero, validateInputs, isDate } from '../u
 const userRouter = express.Router();
 
 userRouter.get('/', UsersController.getAllUsers);
+userRouter.post('/scheduleSettings', nonEmptyString(body('userIds.*')), UsersController.getManyUsersWithScheduleSettings);
 userRouter.get('/:userId', UsersController.getSingleUser);
 userRouter.get('/:userId/settings', UsersController.getUserSettings);
 userRouter.get('/secure-settings/current-user', UsersController.getCurrentUserSecureSettings);

src/backend/src/services/boms.services.ts

@@ -1,4 +1,4 @@
-import { Material_Status, Material_Type, Organization, User } from '@prisma/client';
+import { Material_Status, Material_Type, Organization } from '@prisma/client';
 import Decimal from 'decimal.js';
 import {
   Manufacturer,
@@ -11,7 +11,8 @@ import {
   isHead,
   MaterialType,
   Material,
-  Unit
+  Unit,
+  User
 } from 'shared';
 import prisma from '../prisma/prisma';
 import {

src/backend/src/services/car.services.ts

@@ -1,5 +1,5 @@
-import { Organization, User } from '@prisma/client';
-import { isAdmin } from 'shared';
+import { Organization } from '@prisma/client';
+import { isAdmin, User } from 'shared';
 import { getCarQueryArgs } from '../prisma-query-args/cars.query-args';
 import prisma from '../prisma/prisma';
 import { carTransformer } from '../transformers/cars.transformer';