refactor: rename remaining recipient references to person/people
This commit is contained in:
@@ -68,7 +68,7 @@ type AssetTransitionInput = {
|
||||
previousItemId: string | null
|
||||
nextItemId: string
|
||||
activeAssignment: Assignment | null
|
||||
nextRecipientId?: string
|
||||
nextPersonId?: string
|
||||
}
|
||||
|
||||
function getAssetTransition({
|
||||
@@ -77,7 +77,7 @@ function getAssetTransition({
|
||||
previousItemId,
|
||||
nextItemId,
|
||||
activeAssignment,
|
||||
nextRecipientId,
|
||||
nextPersonId,
|
||||
}: AssetTransitionInput) {
|
||||
return {
|
||||
previousStatus,
|
||||
@@ -87,13 +87,13 @@ function getAssetTransition({
|
||||
statusChanged: previousStatus !== nextStatus,
|
||||
itemChanged: previousItemId !== nextItemId,
|
||||
activeAssignment,
|
||||
nextRecipientId,
|
||||
hasRecipient: Boolean(nextRecipientId),
|
||||
nextPersonId,
|
||||
hasPerson: Boolean(nextPersonId),
|
||||
wasAssigned: previousStatus === "ASSIGNED",
|
||||
willBeAssigned: nextStatus === "ASSIGNED",
|
||||
wasAvailable: previousStatus === "AVAILABLE",
|
||||
willBeAvailable: nextStatus === "AVAILABLE",
|
||||
recipientChanged: activeAssignment?.recipientId !== nextRecipientId,
|
||||
personChanged: activeAssignment?.recipientId !== nextPersonId,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ export async function createAssetUseCase(
|
||||
deliveryNote,
|
||||
status,
|
||||
notes,
|
||||
recipientId,
|
||||
personId,
|
||||
} = input
|
||||
|
||||
try {
|
||||
@@ -141,14 +141,14 @@ export async function createAssetUseCase(
|
||||
)
|
||||
|
||||
const createdAssignment =
|
||||
status === "ASSIGNED" && recipientId
|
||||
status === "ASSIGNED" && personId
|
||||
? await AssignmentService.create(
|
||||
{
|
||||
notes: "",
|
||||
itemId,
|
||||
assetId: newAsset.id,
|
||||
quantity: 1,
|
||||
recipientId,
|
||||
personId,
|
||||
assignmentDate: new Date(),
|
||||
createdBy: actorId,
|
||||
},
|
||||
@@ -162,7 +162,7 @@ export async function createAssetUseCase(
|
||||
assetId: newAsset.id,
|
||||
quantity: 1,
|
||||
type: status === "ASSIGNED" ? "ASSIGNMENT" : "IN",
|
||||
recipientId: createdAssignment?.recipientId || undefined,
|
||||
personId: createdAssignment?.recipientId || undefined,
|
||||
assignmentId: createdAssignment?.id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -203,7 +203,7 @@ export async function updateAssetUseCase(
|
||||
deliveryNote,
|
||||
status,
|
||||
notes,
|
||||
recipientId,
|
||||
personId,
|
||||
} = input
|
||||
|
||||
try {
|
||||
@@ -226,7 +226,7 @@ export async function updateAssetUseCase(
|
||||
previousItemId: currentAsset.itemId,
|
||||
nextItemId: itemId,
|
||||
activeAssignment: currentAsset.assignment,
|
||||
nextRecipientId: recipientId,
|
||||
nextPersonId: personId,
|
||||
})
|
||||
|
||||
const existentAsset = await AssetService.findBySerialNumber(
|
||||
@@ -277,7 +277,7 @@ export async function updateAssetUseCase(
|
||||
? transition.nextItemId
|
||||
: activeAssignment.itemId || undefined,
|
||||
assetId: activeAssignment.assetId || undefined,
|
||||
recipientId: activeAssignment.recipientId || undefined,
|
||||
personId: activeAssignment.recipientId || undefined,
|
||||
assignmentId: activeAssignment.id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -296,7 +296,7 @@ export async function updateAssetUseCase(
|
||||
|
||||
if (
|
||||
transition.statusChanged &&
|
||||
!transition.hasRecipient &&
|
||||
!transition.hasPerson &&
|
||||
!closedActiveAssignment
|
||||
) {
|
||||
const statusMovementItemId = transition.willBeAssigned
|
||||
@@ -408,18 +408,18 @@ export async function updateAssetUseCase(
|
||||
}
|
||||
}
|
||||
|
||||
if (transition.willBeAssigned && transition.nextRecipientId) {
|
||||
if (transition.willBeAssigned && transition.nextPersonId) {
|
||||
const activeAssignment = transition.activeAssignment
|
||||
|
||||
if (activeAssignment) {
|
||||
if (transition.recipientChanged) {
|
||||
if (transition.personChanged) {
|
||||
await MovementService.create(
|
||||
{
|
||||
type: "RETURN",
|
||||
quantity: activeAssignment.quantity || 1,
|
||||
itemId: activeAssignment.itemId || undefined,
|
||||
assetId: activeAssignment.assetId || undefined,
|
||||
recipientId: activeAssignment.recipientId || undefined,
|
||||
personId: activeAssignment.recipientId || undefined,
|
||||
assignmentId: activeAssignment.id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -432,7 +432,7 @@ export async function updateAssetUseCase(
|
||||
quantity: 1,
|
||||
itemId,
|
||||
assetId: id,
|
||||
recipientId: transition.nextRecipientId,
|
||||
personId: transition.nextPersonId,
|
||||
assignmentId: activeAssignment.id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -445,7 +445,7 @@ export async function updateAssetUseCase(
|
||||
createdBy: actorId,
|
||||
itemId,
|
||||
assetId: id,
|
||||
recipientId: transition.nextRecipientId,
|
||||
recipientId: transition.nextPersonId,
|
||||
quantity: 1,
|
||||
returnDate: null,
|
||||
},
|
||||
@@ -457,7 +457,7 @@ export async function updateAssetUseCase(
|
||||
{
|
||||
itemId,
|
||||
assetId: id,
|
||||
recipientId: transition.nextRecipientId,
|
||||
recipientId: transition.nextPersonId,
|
||||
quantity: 1,
|
||||
returnDate: null,
|
||||
},
|
||||
@@ -470,7 +470,7 @@ export async function updateAssetUseCase(
|
||||
itemId,
|
||||
assetId: id,
|
||||
quantity: 1,
|
||||
recipientId: transition.nextRecipientId,
|
||||
personId: transition.nextPersonId,
|
||||
assignmentDate: new Date(),
|
||||
createdBy: actorId,
|
||||
},
|
||||
@@ -483,7 +483,7 @@ export async function updateAssetUseCase(
|
||||
quantity: 1,
|
||||
itemId,
|
||||
assetId: id,
|
||||
recipientId: transition.nextRecipientId,
|
||||
personId: transition.nextPersonId,
|
||||
assignmentId: createdAssignment.id,
|
||||
userId: actorId,
|
||||
},
|
||||
|
||||
@@ -81,9 +81,9 @@ function updateAssignmentError(
|
||||
export async function createAssignmentUseCase(
|
||||
input: CreateAssignmentUseCaseInput,
|
||||
): Promise<CreateAssignmentUseCaseResult> {
|
||||
const { actorId, itemId, assetId, quantity, recipientId } = input
|
||||
const { actorId, itemId, assetId, quantity, personId } = input
|
||||
|
||||
if (!itemId || !recipientId || quantity <= 0) {
|
||||
if (!itemId || !personId || quantity <= 0) {
|
||||
return createAssignmentError({ error: ["Invalid assignment data"] })
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ export async function createAssignmentUseCase(
|
||||
itemId,
|
||||
assetId: assetId || undefined,
|
||||
quantity,
|
||||
recipientId,
|
||||
personId,
|
||||
notes: input.notes,
|
||||
assignmentDate: input.assignmentDate,
|
||||
createdBy: actorId,
|
||||
@@ -155,7 +155,7 @@ export async function createAssignmentUseCase(
|
||||
assetId: assetId || undefined,
|
||||
quantity,
|
||||
type: "ASSIGNMENT",
|
||||
recipientId,
|
||||
personId,
|
||||
assignmentId: createdAssignment.id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -175,7 +175,7 @@ export async function updateAssignmentUseCase(
|
||||
const {
|
||||
actorId,
|
||||
id,
|
||||
recipientId,
|
||||
personId,
|
||||
itemId,
|
||||
assetId,
|
||||
quantity,
|
||||
@@ -216,14 +216,14 @@ export async function updateAssignmentUseCase(
|
||||
}
|
||||
}
|
||||
|
||||
if (assignment.recipientId !== recipientId) {
|
||||
if (assignment.recipientId !== personId) {
|
||||
await MovementService.create(
|
||||
{
|
||||
type: "RETURN",
|
||||
quantity: assignment.quantity || 1,
|
||||
itemId: assignment.itemId || undefined,
|
||||
assetId: assignment.assetId || undefined,
|
||||
recipientId: assignment.recipientId || undefined,
|
||||
personId: assignment.recipientId || undefined,
|
||||
assignmentId: id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -236,7 +236,7 @@ export async function updateAssignmentUseCase(
|
||||
quantity,
|
||||
itemId,
|
||||
assetId: assetId || undefined,
|
||||
recipientId,
|
||||
personId,
|
||||
assignmentId: id,
|
||||
userId: actorId,
|
||||
},
|
||||
@@ -247,7 +247,7 @@ export async function updateAssignmentUseCase(
|
||||
id,
|
||||
{
|
||||
createdBy: actorId,
|
||||
recipientId,
|
||||
recipientId: personId,
|
||||
itemId,
|
||||
assetId,
|
||||
quantity,
|
||||
@@ -261,7 +261,7 @@ export async function updateAssignmentUseCase(
|
||||
await AssignmentService.update(
|
||||
id,
|
||||
{
|
||||
recipientId,
|
||||
recipientId: personId,
|
||||
itemId,
|
||||
assetId,
|
||||
quantity,
|
||||
|
||||
Reference in New Issue
Block a user