refactor: rename remaining recipient references to person/people

This commit is contained in:
2026-06-16 13:34:15 +02:00
parent 29c7c19cd8
commit cf6820a7aa
33 changed files with 225 additions and 213 deletions
+19 -17
View File
@@ -2,12 +2,10 @@ import type { Prisma } from "@/generated/prisma/client"
import { paginate } from "@/lib/paginate"
import prisma from "@/lib/prisma"
import type { CreateAssignmentData } from "@/schemas/assignment.schema"
import type { Assignment, AssignmentWithRecipientItemAsset } from "@/types"
import type { Assignment, AssignmentWithPersonItemAsset } from "@/types"
export const AssignmentService = {
findAllWithRecipient: async (): Promise<
AssignmentWithRecipientItemAsset[]
> => {
findAllWithPerson: async (): Promise<AssignmentWithPersonItemAsset[]> => {
return prisma.assignment.findMany({
where: {
returnDate: {
@@ -15,7 +13,7 @@ export const AssignmentService = {
},
},
include: {
recipient: true,
person: true,
item: true,
asset: true,
},
@@ -24,7 +22,7 @@ export const AssignmentService = {
},
})
},
findAllWithRecipientPaginated: async ({
findAllWithPersonPaginated: async ({
page,
pageSize,
search,
@@ -33,7 +31,7 @@ export const AssignmentService = {
pageSize?: number
search?: string
}) => {
return paginate<AssignmentWithRecipientItemAsset>({
return paginate<AssignmentWithPersonItemAsset>({
model: prisma.assignment,
page,
pageSize,
@@ -45,12 +43,12 @@ export const AssignmentService = {
? {
OR: [
{
recipient: {
person: {
firstName: { contains: search, mode: "insensitive" },
},
},
{
recipient: {
person: {
lastName: { contains: search, mode: "insensitive" },
},
},
@@ -59,7 +57,7 @@ export const AssignmentService = {
: {}),
},
include: {
recipient: true,
person: true,
item: true,
asset: true,
},
@@ -71,23 +69,23 @@ export const AssignmentService = {
findById: async (
id: string,
db: Prisma.TransactionClient | typeof prisma = prisma,
): Promise<AssignmentWithRecipientItemAsset | null> => {
): Promise<AssignmentWithPersonItemAsset | null> => {
return db.assignment.findUnique({
where: { id },
include: {
recipient: true,
person: true,
item: true,
asset: true,
},
})
},
findAllByPerson: async (
recipientId: string,
): Promise<AssignmentWithRecipientItemAsset[]> => {
personId: string,
): Promise<AssignmentWithPersonItemAsset[]> => {
return prisma.assignment.findMany({
where: { recipientId },
where: { recipientId: personId },
include: {
recipient: true,
person: true,
item: true,
asset: true,
},
@@ -97,8 +95,12 @@ export const AssignmentService = {
data: CreateAssignmentData & { createdBy: string },
db: Prisma.TransactionClient | typeof prisma = prisma,
): Promise<Assignment> => {
const { personId, ...rest } = data
return db.assignment.create({
data,
data: {
...rest,
recipientId: personId,
},
})
},
delete: async (id: string): Promise<Assignment> => {