setSideView("")}
+ />
+
+ {/* Right-side panel */}
+
+
+ {/* Vertical split */}
+
+ {/* Left side of a panel */}
+
+
{title}
+
+
+
+
+ {children}
+
+
---------------------------------------------------------------------------------------
+ {itemList}
+
+
+ {/* Right side of panel */}
+
+
+
+ {(sideView === "loanView" || sideView === "eqInfo") &&
+ }
+
+
+
+
+
+
+
{equipmentData.name}
+ {equipmentData.category.name}
+ {equipmentData.items.length - loanCount(equipmentData)}/{equipmentData.items.length} Available
+
+
----------------------------------------------------------------------------------
+
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/labman/src/components/core/card.test.tsx b/labman/src/components/core/card.test.tsx
index df2d32f..c869ebb 100644
--- a/labman/src/components/core/card.test.tsx
+++ b/labman/src/components/core/card.test.tsx
@@ -1,6 +1,7 @@
import { expect, test } from 'vitest'
import { render, screen } from '@testing-library/react'
import Card from './Card'
+import {LoanClass} from "@/types/Loan";
type Loan = {
id: number;
@@ -30,34 +31,42 @@ type Loan = {
};
}
-const loan : Loan = {
- id: 1,
- startDate: new Date("2026-01-01"),
- endDate: new Date("2026-01-19"),
- status: "Active",
- borrower: {
+const loan = new LoanClass (
+ 1,
+ "Active",
+ new Date("2026-01-01"),
+ new Date("2026-01-19"),
+ {
id: 1,
name: "ola",
phone: "95387901",
email: "fkdsfd@g.com",
note: "",
creationDate: new Date(),
+
},
- item: {
+ {
id: 1,
equipment: {
id: 1,
name: "test",
- categoryId: 1,
image: "",
createdAt: new Date(),
+ category: {
+ id: 1,
+ name: "test"
+ },
+ items: []
}
- }
+ },
+ {
+ deleteLoan: () => {},
+ returnLoan: () => {}
+ }
+)
-}
-
-// TODO: JS only supports YYYY-MM-DD natively, so we need to parse Norwegian date format
+// JS only supports YYYY-MM-DD natively, so we need to parse Norwegian date format
function parseNorwegianDate(dateStr: string): Date {
const [day, month, year] = dateStr.split('.').map(Number);
return new Date(Date.UTC(year, month - 1, day));
@@ -71,7 +80,7 @@ test('Loan card correctly updates based on date', () => {
const parentDiv = child.parentElement;
const returnDate = parentDiv?.children[5].textContent;
- const loanStatus = screen.getByText(/Active|Due/)
+ const loanStatus = screen.getByText(/Active|Due/);
if (returnDate && parseNorwegianDate(returnDate) < currentDate) {
expect(loanStatus.textContent).toBe("Due")
diff --git a/labman/src/components/inventory/EquipmentClient.tsx b/labman/src/components/inventory/EquipmentClient.tsx
index 080e154..1a7eaad 100644
--- a/labman/src/components/inventory/EquipmentClient.tsx
+++ b/labman/src/components/inventory/EquipmentClient.tsx
@@ -7,6 +7,7 @@ import SortIcon from "@/components/inventory/sortIcon";
import EquipmentInfo from "@/components/inventory/EquipmentInfo";
import LoanView from "@/components/inventory/LoanView";
import {Equipment} from "@/types/inventory";
+import {useSideView} from "@/app/sideViewContext";
@@ -33,7 +34,7 @@ export default function EquipmentClient({equipmentList}: EquipmentClientProps) {
const [image, setImage] = useState("");
const [selectedEquipment, setSelectedEquipment ] = useState
(null);
- const [sideView, setSideView] = useState("");
+ const { sideView, setSideView } = useSideView();
const [sort, setSort] = useState<{ column: SortColumn, direction: SortDirection}>({
column: null,
@@ -64,7 +65,7 @@ export default function EquipmentClient({equipmentList}: EquipmentClientProps) {
// Adding equipment to the database based on form input
async function handleSubmit(e: React.FormEvent) {
- if (!name || !category || !image) return;
+ if (!name || !category) return;
e.preventDefault();
const res = await fetch("/api/equipment", {
@@ -79,14 +80,19 @@ export default function EquipmentClient({equipmentList}: EquipmentClientProps) {
})
})
// Adding the new equipment to the state
- const newEquipment = await res.json();
- console.log(newEquipment)
+ const result = await res.json();
- setAllEquipment(prev => [...prev, newEquipment]);
- setName("")
- setCategory("")
- setImage("")
+ if (result.type === "success") {
+ const newEquipment = result.data
+ setAllEquipment(prev => [...prev, newEquipment]);
+ setName("")
+ setCategory("")
+ setImage("")
+
+ } else {
+ alert(result.message || "Failed to add equipment")
+ }
}
async function handleDeleteEquipment(name: string) {
@@ -119,14 +125,12 @@ export default function EquipmentClient({equipmentList}: EquipmentClientProps) {
{ sideView == "eqInfo" && selectedEquipment && }
{ sideView == "loanView" && selectedEquipment && }
@@ -134,8 +138,8 @@ export default function EquipmentClient({equipmentList}: EquipmentClientProps) {
diff --git a/labman/src/components/inventory/EquipmentInfo.tsx b/labman/src/components/inventory/EquipmentInfo.tsx
index 7d5342d..2e3ee0d 100644
--- a/labman/src/components/inventory/EquipmentInfo.tsx
+++ b/labman/src/components/inventory/EquipmentInfo.tsx
@@ -3,6 +3,8 @@ import {useEffect, useState} from "react";
import {addUnit, deleteUnit, updateEquipment} from "@/lib/actions";
import {Equipment} from "@/types/inventory";
import {loanCount} from "@/utils/inventoryUtils";
+import SideView from "@/components/core/SideView/SideView";
+import ItemList from "@/components/core/SideView/ItemList";
type Unit = {
id: number;
@@ -16,14 +18,13 @@ type Unit = {
interface EquipmentInfoProps {
equipmentData: Equipment;
- setSideView: (view: string) => void;
allEquipment: Equipment[];
setAllEquipment: React.Dispatch
>;
setSelectedEquipment: (equipment: Equipment | null) => void;
deleteEquipment: (name: string) => void;
}
-export default function EquipmentInfo({equipmentData, setSideView, setAllEquipment, setSelectedEquipment, deleteEquipment}: EquipmentInfoProps) {
+export default function EquipmentInfo({equipmentData, setAllEquipment, setSelectedEquipment, deleteEquipment}: EquipmentInfoProps) {
const [initialFormData, setInitialFormData] = useState({name: equipmentData?.name, category: equipmentData?.category.name, image: equipmentData?.image})
@@ -78,8 +79,8 @@ export default function EquipmentInfo({equipmentData, setSideView, setAllEquipme
async function handleSubmit(e: React.FormEvent) {
e.preventDefault();
- // Check so no fields are empty
- if (!formData.name?.trim() || !formData.category?.trim() || !formData.image?.trim()) {
+ // Check so required fields are not empty (image is optional)
+ if (!formData.name?.trim() || !formData.category?.trim()) {
alert("Please fill in all fields");
setFormData(initialFormData);
return;
@@ -88,17 +89,23 @@ export default function EquipmentInfo({equipmentData, setSideView, setAllEquipme
if (JSON.stringify(formData) === JSON.stringify(initialFormData)) return;
- const updatedEq = await updateEquipment(equipmentData!.id, formData.name!, formData.category!, formData.image!)
+ const res = await updateEquipment(equipmentData.id, formData.name, formData.category, formData.image!)
+ if (res.type !== "success") {
+ alert(res.message);
+ return;
+ }
+
+ const updatedEq = res.data;
const updatedEquipment = {
- ...equipmentData!,
+ ...equipmentData,
name: updatedEq.name,
category: {
id: updatedEq.category.id,
name: updatedEq.category.name
},
image: updatedEq.image,
- categoryId: updatedEq.categoryId
+ categoryId: updatedEq.category.id
}
@@ -111,85 +118,37 @@ export default function EquipmentInfo({equipmentData, setSideView, setAllEquipme
let hasActiveLoan = false;
return (
- <>
- {/* Dark backdrop */}
- setSideView("")}
- />
-
- {/* Right-side panel */}
-
-
- {/* Vertical split */}
-
- {/* Left side of a panel */}
-
-
Equipment information
-
-
-
-
-
-
-
-
- {/* Right side of panel */}
-
-
-
-
-
-
-
-
{equipmentData?.name}
- {equipmentData?.category.name}
- {equipmentData.items.length - loanCount(equipmentData)}/{equipmentData.items.length} Available
-
-
----------------------------------------------------------------------------------
-
History
-
-
+ className="side-form-input" /> */}
+
-
-
+
+
);
}
\ No newline at end of file
diff --git a/labman/src/components/inventory/LoanView.tsx b/labman/src/components/inventory/LoanView.tsx
index c8263ab..01e12b4 100644
--- a/labman/src/components/inventory/LoanView.tsx
+++ b/labman/src/components/inventory/LoanView.tsx
@@ -2,16 +2,9 @@
import {useEffect, useState} from "react";
import {addLoan} from "@/lib/actions";
import {Equipment} from "@/types/inventory";
-import {loanCount} from "@/utils/inventoryUtils";
-
-type Unit = {
- id: number;
- equipmentId: number;
- status: string;
- createdAt: Date;
- notes: string[];
- errors: string[];
-};
+import {Unit} from "@/types/inventory";
+import SideView from "@/components/core/SideView/SideView"
+import ItemList from "@/components/core/SideView/ItemList";
type Borrower = {
id: number;
@@ -22,14 +15,12 @@ type Borrower = {
interface LoanViewProps {
equipmentData: Equipment;
- setSideView: (view: string) => void;
setAllEquipment: React.Dispatch
>;
setSelectedEquipment: (equipment: Equipment | null) => void;
}
-export default function LoanView({setSideView, equipmentData, setAllEquipment, setSelectedEquipment} : LoanViewProps) {
+export default function LoanView({equipmentData, setAllEquipment, setSelectedEquipment} : LoanViewProps) {
const [borrowers, setBorrowers] = useState([]);
-
useEffect(() => {
fetch("/api/borrower")
.then(res => res.json())
@@ -51,9 +42,13 @@ export default function LoanView({setSideView, equipmentData, setAllEquipment, s
alert("Please fill in all required fields");
return;
}
- const newLoan = await addLoan(formData.borrower, formData.startDate, formData.endDate, selectedUnit.id, formData.borrowerPhone, formData.borrowerEmail);
+ const res = await addLoan(formData.borrower, formData.startDate, formData.endDate, selectedUnit.id, formData.borrowerPhone, formData.borrowerEmail);
- if (!newLoan) return;
+ if (res.type !== "success") {
+ alert(res.message);
+ return;
+ }
+ const newLoan = res.data;
const updatedEquipment = {
...equipmentData,
@@ -80,141 +75,91 @@ export default function LoanView({setSideView, equipmentData, setAllEquipment, s
//TODO: More imrpovements to do on this form and the other forms plus valditation of the form data. Delaying this until the core functionality is done.
return (
- <>
- {/* Dark backdrop */}
- setSideView("")}
- />
-
- {/* Right-side panel */}
-
-
- {/* Vertical split */}
-
- {/* Left side of a panel */}
-
-
New Loan
-
-
-
-
-
-
-
-
-
-
---------------------------------------------------------------------------------------
-
Items
-
-
- {equipmentData.items.map((unit, index) => (
- console.log(unit.activeLoan),
- hasActiveLoan = unit.activeLoan != null,
-
-
Unit {index + 1}
- { hasActiveLoan && (unit.activeLoan.status !== "Returned") &&
Borrowed
}
- { (!hasActiveLoan || (hasActiveLoan && unit.activeLoan.status === "Returned")) &&
}
-
-
- )) }
-
-
-
-
- {/* Right side of panel */}
-
-
-
-
-
-
-
-
{equipmentData.name}
- {equipmentData.category.name}
- {equipmentData.items.length - loanCount(equipmentData)}/{equipmentData.items.length} Available
-
-
----------------------------------------------------------------------------------
-
History
-
-
+
}>
+ <>
+
+
+
+
+
+
+
+
-
-
+
+
);
}
\ No newline at end of file
diff --git a/labman/src/components/loans/EditLoan.tsx b/labman/src/components/loans/EditLoan.tsx
new file mode 100644
index 0000000..8d902fb
--- /dev/null
+++ b/labman/src/components/loans/EditLoan.tsx
@@ -0,0 +1,201 @@
+"use client"
+
+import {useEffect, useState} from "react";
+import {updateLoan} from "@/lib/actions";
+import {Loan} from "@/types/Loan";
+import SideView from "@/components/core/SideView/SideView";
+import {Unit} from "@/types/inventory";
+import ItemList from "@/components/core/SideView/ItemList";
+
+
+type Borrower = {
+ id: number;
+ name: string;
+ phone: string;
+ email: string;
+}
+
+interface EditLoanProps {
+ loan: Loan;
+ setLoans: React.Dispatch
>;
+}
+
+export default function EditLoan({loan, setLoans}: EditLoanProps) {
+
+ const [initialFormData, setInitialFormData] = useState({borrower: loan.borrower.name, startDate: loan.startDate, endDate: loan.endDate, borrowerPhone: loan.borrower.phone, borrowerMail: loan.borrower.email})
+ const [formData, setFormData] = useState(initialFormData);
+
+ const phoneRequired = formData.borrowerMail?.trim() === "";
+ const emailRequired = formData.borrowerPhone?.trim() === "";
+
+ const [selectedUnit, setSelectedUnit] = useState(loan.item);
+
+ const [borrowers, setBorrowers] = useState([]);
+ useEffect(() => {
+ fetch("/api/borrower")
+ .then(res => res.json())
+ .then(data => setBorrowers(data))
+ }, [initialFormData]);
+
+ async function handleSubmit(e: React.FormEvent) {
+ e.preventDefault();
+
+ if (
+ !formData.borrower.trim()
+ || !formData.startDate
+ || !formData.endDate
+ || (!formData.borrowerPhone?.trim() && !formData.borrowerMail?.trim())
+ ) {
+ alert("Please fill in all required fields");
+ return;
+ }
+ let updatedLoan: Loan;
+
+ // Will wait for a confirmation from the user before updating the loan
+ // To prevent empty lines in the message it will render a list of strings instead of a single string, and filter out strings that are empty
+ if (confirm(`These changes will be applied:\n${[
+ formData.borrower !== initialFormData.borrower ? `Borrower name: ${initialFormData.borrower} -> ${formData.borrower}` : "",
+ formData.startDate !== initialFormData.startDate ? `Start date: ${initialFormData.startDate.toLocaleDateString()} -> ${formData.startDate.toLocaleDateString()}` : "",
+ formData.endDate !== initialFormData.endDate ? `End date: ${initialFormData.endDate.toLocaleDateString()} -> ${formData.endDate.toLocaleDateString()}` : "",
+ formData.borrowerPhone !== initialFormData.borrowerPhone ? `Borrower phone number: ${initialFormData.borrowerPhone} -> ${formData.borrowerPhone}` : "",
+ formData.borrowerMail !== initialFormData.borrowerMail ? `Borrower email: ${initialFormData.borrowerMail} -> ${formData.borrowerMail}` : "",
+ selectedUnit.id !== loan.item.id ? `Unit ${loan.item.id} -> Borrowed equipment unit: Unit ${selectedUnit.id}` : ""
+ ].filter(Boolean).join("\n")}`)) {
+
+ const res = await updateLoan(
+ loan.id,
+ formData.startDate,
+ formData.endDate,
+ formData.borrower,
+ loan.borrower.id,
+ selectedUnit.id,
+ formData.borrowerPhone,
+ formData.borrowerMail
+ );
+ console.log(res);
+
+ if (res.type === "error") {
+ alert(res.message);
+ return;
+ } else if (res.type === "success") {
+ updatedLoan = res.data;
+ }
+
+ setLoans(prev =>
+ prev.map(loan => loan.id === updatedLoan.id ? updatedLoan : loan)
+
+ )
+ setInitialFormData(formData);
+
+ } else {
+ return;
+ }
+
+
+ }
+
+ return(
+ <>
+ }>
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/labman/src/lib/actions.ts b/labman/src/lib/actions.ts
index bcf85d4..82e6a12 100644
--- a/labman/src/lib/actions.ts
+++ b/labman/src/lib/actions.ts
@@ -3,33 +3,44 @@ import prisma from "@/lib/prisma"
import {revalidatePath} from "next/cache";
import {deleteSession, validateSessionToken} from "@/auth/session"
import {cookies} from "next/headers";
+import {Borrower} from "@/generated/prisma";
+import {Equipment, EquipmentWithCategoryAndItems} from "@/types/inventory"
+import {Loan as ExtendedLoan} from "@/types/Loan";
+import {Loan} from "@/generated/prisma";
+import {redirect} from "next/navigation";
-export async function deleteUser(userId : number) {
+type ActionResult = | { type: "success"; data: T} | { type: "confirm"; message: string} | { type: "error"; message: string}
+
+// Used to delay the execution of an action for testing purposes
+function delay(ms : number) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export async function deleteUser(userId : number) : Promise> {
+
+ if (await getUser() === null) {
+ return {type: "error", message: "Could not find a valid user"}
+ }
+
+ // if (userId === 1) {return {type: "error", message: "Cannot delete admin user"}}
const user = await prisma.user.findUnique({
- where: {
- id: userId
- },
- include: {
- sessions: true
- }
+ where: {id: userId},
+ include: {sessions: true}
})
-
if (user) {
- console.log(user.sessions)
for (const session of user.sessions) {
await deleteSession(session.id);
}
}
await prisma.user.delete({
- where: {
- id: userId
- }
+ where: {id: userId}
});
revalidatePath("/users");
+ return {type: "success", data: undefined};
}
export async function getSession() {
@@ -38,33 +49,26 @@ export async function getSession() {
if (token) {
return validateSessionToken(token);
} else {
- console.log("No active session");
return null;
}
}
export async function logout() {
- console.log("Logging out");
const session = await getSession();
- if (session) {
- await deleteSession(session.id);
- }
+ if (session) {await deleteSession(session.id);}
+ redirect("/login")
}
export async function deleteEquipment(name: string) {
await prisma.equipment.delete({
- where: {
- name: name
- }
+ where: {name: name}
})
revalidatePath("/");
}
export async function deleteUnit(id: number) {
await prisma.item.delete({
- where: {
- id: id
- }
+ where: {id: id}
})
revalidatePath("/");
}
@@ -72,107 +76,212 @@ export async function deleteUnit(id: number) {
export async function addUnit(equipmentName: string) {
const equipment = await prisma.equipment.findUnique({
- where: {
- name: equipmentName
- }
+ where: {name: equipmentName}
})
if (!equipment) {alert("Equipment not found"); return}
const newUnit = await prisma.item.create({
- data: {
- equipmentId: equipment.id,
- status: "Available",
- },
+ data: {equipmentId: equipment.id, status: "Available",},
// TODO: Relational properties always have to be specified or else they will not be included in the response
- include: {
- loans: true,
- activeLoan: true
- }
+ include: {loans: true, activeLoan: true}
})
revalidatePath("/");
- console.log("Added unit");
return newUnit;
}
-export async function updateEquipment (equipmentId: number, name: string, category: string, image: string) {
+export async function updateEquipment (equipmentId: number, name: string, category: string, image: string) : Promise> {
let categoryId = 0;
-
let equipmentCategory = await prisma.equipmentCategory.findUnique({where: {name: category}})
if (equipmentCategory) {
- console.log("Category exists");
categoryId = equipmentCategory.id
} else {
- console.log("Category exists")
equipmentCategory = await prisma.equipmentCategory.create({data: {name: category}})
categoryId = equipmentCategory.id
}
+ const existingEquipment = await prisma.equipment.findUnique({where: {name: name}})
+
+ if (existingEquipment) {
+ return {type: "error", message: "Equipment already exists"}
+ }
+
const equipment = await prisma.equipment.update({
- where: {
- id: equipmentId,
- },
- data : {
- name: name,
- categoryId: categoryId,
- image: image
- },
- include: {category: true}
+ where: {id: equipmentId},
+ data : {name: name, categoryId: categoryId, image: image},
+ include: {
+ category: true,
+ items: true
+ }
})
revalidatePath("/");
- return equipment;
+ return {type: "success", data: equipment};
}
-export async function addLoan (borrower : string, start : string, end : string, unitId : number, phone? : string, email? : string) {
- const dateStart = new Date(start);
- const dateEnd = new Date(end);
+export async function addBorrower(name: string, phone?: string | null, email?: string | null, borrowerId?: number) : Promise> {
const user = await getUser();
+ if (!user) {return {type: "error", message: "Could not find a valid user"}}
+ let borrower : Borrower | null = null;
- if (!user) {alert("Could not find a valid user"); return}
- let borrowerUser = await prisma.borrower.findUnique({
- where: {
- phone: phone
+ // If phone or email is actually empty, set it to null
+ if (phone?.trim() === "") {phone = null}
+ if (email?.trim() === "") {email = null}
+
+ // If borrowerId is provided, update the borrower with the provided information
+ if (borrowerId) {
+ borrower = await prisma.borrower.findUnique({where:{id: borrowerId}})
+ /* TODO: Potentially unsafe. The function can in theory be called with an unrelated id updating the wrong borrower
+ Since the unique values phone and mail can change they can't be used to verify the borrower.
+ A possible solution is to compare the old values with what is currently stored in the database.
+ But it shouldn't really be a big deal as there is now way for the client to abuse it.*/
+ if (!borrower) {return {type: "error", message: "Could not find borrower with id " + borrowerId}}
+
+
+ if (phone && borrower.phone !== phone) {
+ console.log("Phone number has changed, checking for duplicates")
+ if (await prisma.borrower.findUnique({where:{phone: phone}})) {
+ console.log("Borrower with phone number already exists")
+
+ return {type: "error", message: `A borrower with the same phone number already exists.`}
+ }
+ } else if (email && borrower.email !== email) {
+ if (await prisma.borrower.findUnique({where:{email: email}}))
+ return {type: "error", message: `A borrower with the same email already exists.`}
}
- })
- if (!borrowerUser) {
- borrowerUser = await prisma.borrower.create({
+
+ borrower = await prisma.borrower.update(
+ {
+ where: {id: borrowerId},
+ data: {name: name, phone: phone, email: email}
+ }
+ )
+ return {type: "success", data: borrower};
+ }
+
+ if (phone) {
+ borrower = await prisma.borrower.findUnique({where:{phone: phone}})
+ if (borrower && borrower.name !== name) {
+ return {type: "error", message: `A borrower with the same phone number already exists (${borrower.name}). Please try again.`}
+ }
+ } else if (email) {
+ borrower = await prisma.borrower.findUnique({where:{email: email}})
+ if (borrower && borrower.name !== name) {
+ return {type: "error", message: `A borrower with the same email already exists (${borrower.name}). Please try again.`}
+ }
+ } else {
+ return {type: "error", message: "No borrower phone/email provided"}
+ }
+
+ if (!borrower) {
+ borrower = await prisma.borrower.create({
data: {
- name: borrower,
+ name: name,
phone: phone,
email: email,
+ status: "Active",
note: "",
creationDate: new Date(),
}
})
}
+ return {type: "success", data: borrower};
+}
+
+export async function updateLoan (loanId: number, start : Date, end : Date, borrowerName : string, borrowerId : number, unitId : number, phone? : string | null, email? : string | null) : Promise> {
+ if (await getUser() === null) {return {type:"error", message: "Could not find a valid user"}}
+
+ // Check if the loan exists
+ const currentLoan = await prisma.loan.findUnique({where: {id: loanId}})
+ if (!currentLoan) {return {type: "error", message: "Could not find corresponding loan in database"}}
+
+ // Find the connected borrower and update borrower details if needed
+ const res = await addBorrower(borrowerName, phone, email, borrowerId)
+ if (res.type !== "success") {return {type: "error", message: res.message}}
+
+ // If the user has changed the unit being loaned, check that this is unit is available
+ if (currentLoan.itemId !== unitId) {
+ const newUnit = await prisma.item.findUnique({where: {id: unitId}})
+ if (!newUnit) {return {type: "error", message: "Could not find corresponding unit in database"}}
+ if (newUnit.status !== "Available") {return {type: "error", message: "The selected unit is not available"}}
+
+ await prisma.item.update({
+ where: {id: currentLoan.itemId},
+ data: {status: "Available", activeLoanId: null}
+ })
+
+ await prisma.item.update({
+ where: {id: unitId},
+ data: {status: "Unavailable", activeLoanId: null}
+ })
+ }
+
+ const loan = await prisma.loan.update({
+ where: {id: loanId},
+ data: {
+ startDate: start,
+ endDate: end,
+ borrowerId: res.data.id,
+ itemId: unitId
+ },
+ include: {
+ borrower: true,
+ item: {
+ include: {
+ equipment: {
+ include: {
+ category: true,
+ items: {
+ include: {
+ loans: true,
+ activeLoan: true
+ }
+ }
+
+ }
+ }
+ }
+ }
+ }
+ })
+ revalidatePath("/loans");
+ return {type: "success", data: loan};
+
+}
+
+export async function addLoan (borrowerName : string, start : string, end : string, unitId : number, phone : string | null, email : string | null) : Promise> {
+ const dateStart = new Date(start);
+ const dateEnd = new Date(end);
+ const user = await getUser();
+ if (!user) {
+ return {type: "error", message: "Could not find a valid user"}
+ }
+
+ const res = await addBorrower(borrowerName, phone, email)
+ if (res.type !== "success") {
+ return {type: "error", message: res.message}
+ }
const loan = await prisma.loan.create({
data: {
startDate: dateStart,
endDate: dateEnd,
status: "Active",
- borrowerId: borrowerUser.id,
+ borrowerId: res.data.id,
userId: user.id,
itemId: unitId
}
})
- const item = await prisma.item.update({
- where: {
- id: unitId
- },
- data: {
- status: "Unavailable",
- activeLoanId: loan.id
- }
+ await prisma.item.update({
+ where: {id: unitId},
+ data: {status: "Unavailable", activeLoanId: loan.id}
})
- console.log(item.activeLoan);
revalidatePath("/");
- return loan;
+ return {type: "success", data: loan};
}
export async function getUser() {
@@ -181,16 +290,25 @@ export async function getUser() {
if (session) {
const tSession = await prisma.session.findUnique({
where: { id: session.id },
- include: {
- user: true
- }
+ include: {user: true}
})
return tSession?.user;
- }
+ } else {
+ return null;
+ }
}
export async function deleteLoan(id: number) {
+ const loan = await prisma.loan.findUnique({
+ where: {id: id}
+ })
+ if (!loan) {return}
+
+ await prisma.item.update({
+ where: {activeLoanId: loan.id},
+ data: {status: "Available", activeLoanId: null}
+ })
await prisma.loan.delete({
where: {
id: id
@@ -200,13 +318,14 @@ export async function deleteLoan(id: number) {
}
export async function returnLoan(id: number) {
- await prisma.loan.update({
- where: {
- id: id
- },
- data: {
- status: "Returned"
- }
+ const loan = await prisma.loan.update({
+ where: {id: id},
+ data: {status: "Returned"}
+ })
+ await prisma.item.update({
+ where: {activeLoanId: loan.id},
+ data: {status: "Available", activeLoanId: null}
})
+
revalidatePath("/loans");
}
\ No newline at end of file
diff --git a/labman/src/middleware.ts b/labman/src/middleware.ts
index 4f3883c..707c1ef 100644
--- a/labman/src/middleware.ts
+++ b/labman/src/middleware.ts
@@ -22,4 +22,4 @@ export async function middleware(req: NextRequest) {
return NextResponse.next();
}
-export const config = {matcher: ["/", "/users"]};
\ No newline at end of file
+export const config = {matcher: ["/", "/users", "/loans"]};
\ No newline at end of file
diff --git a/labman/src/types/Loan.ts b/labman/src/types/Loan.ts
new file mode 100644
index 0000000..67d8fd0
--- /dev/null
+++ b/labman/src/types/Loan.ts
@@ -0,0 +1,66 @@
+import {Equipment} from "@/types/inventory";
+
+export type LoanActions = {
+ deleteLoan: (id: number) => void;
+ returnLoan: (id: number) => void;
+}
+
+export type Loan = {
+ id: number;
+ startDate: Date;
+ endDate: Date;
+ status: string;
+
+ borrower: {
+ id: number;
+ name: string;
+ phone?: string | null;
+ email?: string | null
+ note?: string | null
+ creationDate: Date;
+
+ }
+ item: {
+ id: number;
+ equipmentId: number;
+ status: string;
+ createdAt: Date;
+ notes: string[];
+ errors: string[];
+ equipment: Equipment;
+ }
+}
+
+type Borrower = {
+ id: number;
+ name: string;
+ phone?: string | null;
+ email?: string | null
+ note?: string | null
+ creationDate: Date;
+}
+
+type Item = {
+ id: number;
+ equipment: Equipment;
+}
+
+export class LoanClass {
+ constructor(
+ public id: number,
+ public status: string,
+ public startDate: Date,
+ public endDate: Date,
+ public borrower : Borrower,
+ public item : Item,
+ private actions: LoanActions
+ ) {}
+
+ return() {
+ this.actions.returnLoan(this.id);
+ }
+
+ delete() {
+ this.actions.deleteLoan(this.id);
+ }
+}
\ No newline at end of file
diff --git a/labman/src/types/User.ts b/labman/src/types/User.ts
new file mode 100644
index 0000000..5ac5cb3
--- /dev/null
+++ b/labman/src/types/User.ts
@@ -0,0 +1,19 @@
+export type UserActions = {
+ deleteUser: (id: number) => void;
+};
+
+export class UserClass {
+ constructor(
+ public id: number,
+ public username: string,
+ public createdAt: Date,
+ public latestActivity: Date,
+ private actions: UserActions,
+ public status: string | null
+ ) {}
+
+
+ delete() {
+ this.actions.deleteUser(this.id);
+ }
+}
\ No newline at end of file
diff --git a/labman/src/types/inventory.ts b/labman/src/types/inventory.ts
index 464ad0e..cd90895 100644
--- a/labman/src/types/inventory.ts
+++ b/labman/src/types/inventory.ts
@@ -3,7 +3,7 @@
export type Equipment = {
id: number;
name: string;
- image: string;
+ image: string | null;
category: {
id: number;
name: string;
@@ -23,4 +23,34 @@ export type Equipment = {
}[]
}
+export type EquipmentWithCategoryAndItems = {
+ id: number;
+ name: string;
+ image: string | null;
+ category: {
+ id: number;
+ name: string;
+ }
+ createdAt: Date;
+ items: {
+ id: number;
+ equipmentId: number;
+ status: string;
+ createdAt: Date;
+ notes: string[];
+ errors: string[];
+ activeLoanId: number | null;
+
+ }[]
+}
+
+export type Unit = {
+ id: number;
+ equipmentId: number;
+ status: string;
+ createdAt: Date;
+ notes: string[];
+ errors: string[];
+};
+
// TODO: Difference between null and undefined and ? means optional
\ No newline at end of file
diff --git a/labman/tests/example.spec.ts b/labman/tests/example.spec.ts
index 6282e8c..81ac64e 100644
--- a/labman/tests/example.spec.ts
+++ b/labman/tests/example.spec.ts
@@ -10,13 +10,13 @@ test('has title', async ({ page }) => {
test('login', async ({ page }) => {
await page.goto('http://localhost:3000/login');
- // Click the get started link.
+
await page.getByPlaceholder("Username").fill("test");
await page.getByPlaceholder("Password").fill("1234");
await page.getByRole('button', { name: 'Login' }).click();
- // Expects page to have a heading with the name of Installation.
+
await expect(page.getByRole('heading', { name: 'Inventory' })).toBeVisible();
});