reverted changes made regarding users searching in branch #36-cohort_entity_update

Author: homonoviscoding

src/controllers/user.js

@@ -1,7 +1,7 @@
 import User from '../domain/user.js'
 import dbClient from '../utils/dbClient.js'
 import { sendDataResponse, sendMessageResponse } from '../utils/responses.js'
-import { validateCanModify, isValidName } from '../utils/validationFunctions.js'
+import { validateCanModify } from '../utils/validationFunctions.js'
 import * as validation from '../utils/validationFunctions.js'
 import ERR from '../utils/errors.js'
 
@@ -122,27 +122,3 @@ export const deleteUserById = async (req, res) => {
     return sendDataResponse(res, 500, { error: ERR.DELETE_GENERIC_ERROR })
   }
 }
-
-export const searchUserByName = async (req, res) => {
-  const { name } = req.body
-
-  if (!name) {
-    return sendMessageResponse(res, 400, ERR.NAME_REQUIRED)
-  }
-
-  if (!isValidName(name)) {
-    return sendMessageResponse(res, 400, ERR.NAME_FORMATTING)
-  }
-
-  try {
-    const users = await User.searchUserByName(name)
-
-    if (users.length === 0) {
-      return sendMessageResponse(res, 404, ERR.NAME_USER_NOT_FOUND)
-    }
-    return sendDataResponse({ users })
-  } catch (e) {
-    console.error('Error searching for users:', e)
-    return sendMessageResponse(res, 500, ERR.UNABLE_TO_SEARCH_USER)
-  }
-}

src/domain/user.js

@@ -236,54 +236,6 @@ export default class User {
     })
     return updatedUser
   }
-
-  static async searchUserByName(name) {
-    const splitName = name.split(' ')
-
-    const searchedUser = await dbClient.user.findMany({
-      where: {
-        OR: [
-          {
-            firstName: {
-              contains: name,
-              mode: 'insensitive'
-            }
-          },
-          {
-            lastName: {
-              contains: name,
-              mode: 'insensitive'
-            }
-          },
-          {
-            AND:
-              splitName.length > 1
-                ? [
-                    {
-                      firstName: {
-                        contains: splitName[0],
-                        mode: 'insensitive'
-                      }
-                    },
-                    {
-                      lastName: { contains: splitName[1], mode: 'insensitive' }
-                    }
-                  ]
-                : []
-          }
-        ]
-      },
-      include: {
-        profile: true,
-        cohort: true,
-        posts: true,
-        deliveryLogs: true,
-        notesCreated: true,
-        notesReceived: true
-      }
-    })
-    return searchedUser
-  }
 }
 
 async function _findByUniqueAsATeacher(id) {

src/routes/user.js

@@ -4,8 +4,7 @@ import {
   getById,
   getAll,
   updateById,
-  deleteUserById,
-  searchUserByName
+  deleteUserById
 } from '../controllers/user.js'
 import { validateAuthentication } from '../middleware/auth.js'
 
@@ -16,6 +15,5 @@ router.get('/', validateAuthentication, getAll)
 router.get('/:id', validateAuthentication, getById)
 router.delete('/:id', validateAuthentication, deleteUserById)
 router.patch('/:id', validateAuthentication, updateById)
-router.get('/search', validateAuthentication, searchUserByName)
 
 export default router

src/utils/errors.js

@@ -25,9 +25,5 @@ export default {
   INTERNAL_ERROR: 'The server was unable to complete this request',
   MISSING_CONTENT: 'The content is missing from the request body',
   INVALID_NOTE_CONTENT: 'Some text must be provided in order to create a note',
-  UNABLE_TO_CREATE_COHORT: 'Unable to create a new cohort.',
-  NAME_REQUIRED: 'A name must be provided.',
-  NAME_FORMATTING: 'Names can only contain letters',
-  UNABLE_TO_SEARCH_USER: 'Unable to search for users',
-  NAME_USER_NOT_FOUND: 'user not found by that name'
+  UNABLE_TO_CREATE_COHORT: 'Unable to create a new cohort.'
 }

src/utils/validationFunctions.js

@@ -1,9 +1,4 @@
-import {
-  emailRegex,
-  passwordRegex,
-  dateRegex,
-  nameRegex
-} from './regexMatchers.js'
+import { emailRegex, passwordRegex, dateRegex } from './regexMatchers.js'
 import ERR from './errors.js'
 
 export function register(email, password) {
@@ -59,8 +54,3 @@ export function validateCanModify(req) {
   }
   return true
 }
-
-export function isValidName(name) {
-  nameRegex.test(name)
-  return true
-}