Skip to content

Commit bad7020

Browse files
jzakotnikjzakotnik
authored
Merge pull request #53 from jzakotnik/52-audit-logs-db
52 audit logs db
2 parents 5abec6c + 6e14fbb commit bad7020

File tree

12 files changed

+244
-19
lines changed

12 files changed

+244
-19
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,4 @@ prisma/database/dev.db
117117
public/antolin/antolingesamt.csv
118118
cypress/cypress.env.json
119119
cypress.env.json
120+
prisma/database/dev.db-journal

‎components/book/BookSummaryCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export default function BookSummaryCard({
9898
<CardActions>
9999
<Link href={"/book/" + book.id} passHref>
100100
<Button size="small" data-cy="book_card_editbutton">
101-
Editieren
101+
Details
102102
</Button>
103103
</Link>
104104
{book.rentalStatus != "available" ? (

‎entities/AuditType.ts

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
export interface AuditType {
2+
createdAt?: string;
3+
updatedAt?: string;
24
id?: number;
35
eventType: string;
46
eventContent: string;
7+
bookid: number;
8+
userid: number;
59
}

‎entities/audit.ts

+31-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,43 @@ export async function getLastAudit(client: PrismaClient) {
1818
}
1919
}
2020

21+
export async function getAllAudit(
22+
client: PrismaClient,
23+
take: number = 1000
24+
): Promise<Array<any>> {
25+
try {
26+
const lastAudits = await client.audit.findMany({
27+
orderBy: { id: "desc" },
28+
take: take,
29+
});
30+
31+
return lastAudits;
32+
} catch (e) {
33+
if (
34+
e instanceof Prisma.PrismaClientKnownRequestError ||
35+
e instanceof Prisma.PrismaClientValidationError
36+
) {
37+
console.log("ERROR in get Audit Log: ", e);
38+
}
39+
throw e;
40+
}
41+
}
42+
2143
export async function addAudit(
2244
client: PrismaClient,
2345
eventType: string,
24-
eventContent: string
46+
eventContent: string,
47+
bookid: number = 0,
48+
userid: number = 0
2549
) {
2650
try {
2751
return await client.audit.create({
28-
data: { eventType: eventType, eventContent: eventContent },
52+
data: {
53+
eventType: eventType,
54+
eventContent: eventContent,
55+
bookid: bookid,
56+
userid: userid,
57+
},
2958
});
3059
} catch (e) {
3160
if (

‎entities/book.ts

+27-9
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export async function countBook(client: PrismaClient) {
134134
export async function addBook(client: PrismaClient, book: BookType) {
135135
console.log("Adding book", book);
136136
try {
137-
addAudit(client, "Add book", book.title);
137+
addAudit(client, "Add book", book.title, book.id);
138138
return await client.book.create({
139139
data: { ...book },
140140
});
@@ -157,8 +157,9 @@ export async function updateBook(
157157
try {
158158
await addAudit(
159159
client,
160-
"update",
161-
book.id ? book.id.toString() : "undefined"
160+
"Update book",
161+
book.id ? book.id.toString() + ", " + book.title : "undefined",
162+
id
162163
);
163164
return await client.book.update({
164165
where: {
@@ -179,7 +180,7 @@ export async function updateBook(
179180

180181
export async function deleteBook(client: PrismaClient, id: number) {
181182
try {
182-
await addAudit(client, "delete", id.toString());
183+
await addAudit(client, "Delete book", id.toString(), id);
183184
return await client.book.delete({
184185
where: {
185186
id,
@@ -224,7 +225,12 @@ export async function extendBook(
224225
where: { id: bookid },
225226
data: { renewalCount: { increment: 1 }, dueDate: updatedDueDate },
226227
});
227-
await addAudit(client, "extend", bookid.toString());
228+
await addAudit(
229+
client,
230+
"Extend book",
231+
"book id " + bookid.toString() + ", " + book.title,
232+
bookid
233+
);
228234
} catch (e) {
229235
if (
230236
e instanceof Prisma.PrismaClientKnownRequestError ||
@@ -245,7 +251,12 @@ export async function returnBook(client: PrismaClient, bookid: number) {
245251
return "ERROR in returning a book, this user does not have a book";
246252
}
247253
const userid = book.userId;
248-
await addAudit(client, "return book", bookid.toString());
254+
await addAudit(
255+
client,
256+
"Return book",
257+
"book id " + bookid.toString() + ", " + book.title,
258+
bookid
259+
);
249260
const transaction = [];
250261
transaction.push(
251262
client.book.update({
@@ -310,8 +321,8 @@ export async function rentBook(
310321
//put all into one transaction
311322

312323
//if the book is rented already, you cannot rent it
324+
const book = await getBook(client, bookid);
313325
try {
314-
const book = await getBook(client, bookid);
315326
if (book?.rentalStatus == "rented") {
316327
console.log("ERROR in renting a book: It is rented already");
317328
return "ERROR, book is rented";
@@ -327,8 +338,15 @@ export async function rentBook(
327338
}
328339
await addAudit(
329340
client,
330-
"rent book",
331-
"user id " + userid.toString() + ", book id " + bookid.toString()
341+
"Rent book",
342+
"User id: " +
343+
userid.toString() +
344+
", Book id: " +
345+
bookid.toString() +
346+
", book title: " +
347+
book?.title,
348+
bookid,
349+
userid
332350
);
333351
const transaction = [];
334352

‎entities/fieldTranslations.ts

+7
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ export const translations = {
5252
remainingDays: "Verzug",
5353
userid: "Nutzer ID",
5454
},
55+
audits: {
56+
id: "Nr",
57+
eventType: "Aktivität",
58+
eventContent: "Details",
59+
bookid: "Mediennummer",
60+
userid: "Ausweisnummer",
61+
},
5562
rentalStatus: {
5663
available: "Verfügbar",
5764
rented: "Ausgeliehen",

‎entities/user.ts

+23-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { PrismaClient, Prisma } from "@prisma/client";
21
import { UserType } from "@/entities/UserType";
2+
import { Prisma, PrismaClient } from "@prisma/client";
3+
import { addAudit } from "./audit";
34

45
export async function getUser(client: PrismaClient, id: number) {
56
try {
@@ -54,6 +55,15 @@ export async function countUser(client: PrismaClient) {
5455

5556
export async function addUser(client: PrismaClient, user: UserType) {
5657
try {
58+
await addAudit(
59+
client,
60+
"Add user",
61+
user.id
62+
? user.id.toString() + ", " + user.firstName + " " + user.lastName
63+
: "undefined",
64+
0,
65+
0
66+
);
5767
return await client.user.create({
5868
data: { ...user },
5969
});
@@ -74,6 +84,15 @@ export async function updateUser(
7484
user: UserType
7585
) {
7686
try {
87+
await addAudit(
88+
client,
89+
"Update user",
90+
user.id
91+
? user.id.toString() + ", " + user.firstName + " " + user.lastName
92+
: "undefined",
93+
0,
94+
id
95+
);
7796
return client.user.update({
7897
where: {
7998
id,
@@ -92,6 +111,7 @@ export async function updateUser(
92111
}
93112

94113
export async function disableUser(client: PrismaClient, id: number) {
114+
await addAudit(client, "Disable user", id.toString(), 0, id);
95115
return await client.user.update({
96116
where: {
97117
id,
@@ -101,6 +121,7 @@ export async function disableUser(client: PrismaClient, id: number) {
101121
}
102122

103123
export async function enableUser(client: PrismaClient, id: number) {
124+
await addAudit(client, "Enable user", id.toString(), 0, id);
104125
return await client.user.update({
105126
where: {
106127
id,
@@ -120,6 +141,7 @@ export async function isActive(client: PrismaClient, id: number) {
120141
}
121142

122143
export async function deleteUser(client: PrismaClient, id: number) {
144+
await addAudit(client, "Delete user", id.toString(), 0, id);
123145
return await client.user.delete({
124146
where: {
125147
id,

‎pages/reports/audit.tsx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
import Layout from "@/components/layout/Layout";
2+
import { translations } from "@/entities/fieldTranslations";
3+
import Box from "@mui/material/Box";
4+
import { deDE as coreDeDE } from "@mui/material/locale";
5+
import { ThemeProvider, createTheme } from "@mui/material/styles";
6+
import { DataGrid, GridToolbar, deDE } from "@mui/x-data-grid";
7+
import { PrismaClient } from "@prisma/client";
8+
import { useEffect, useState } from "react";
9+
10+
import { AuditType } from "@/entities/AuditType";
11+
import { getAllAudit } from "@/entities/audit";
12+
import { convertDateToTimeString } from "@/utils/dateutils";
13+
import type {} from "@mui/x-data-grid/themeAugmentation";
14+
15+
const prisma = new PrismaClient();
16+
17+
const theme = createTheme(
18+
{
19+
palette: {
20+
primary: { main: "#1976d2" },
21+
},
22+
},
23+
deDE, // x-data-grid translations
24+
coreDeDE // core translations
25+
);
26+
27+
interface AuditPropsType {
28+
audits: Array<AuditType>;
29+
}
30+
31+
interface ReportKeyType {
32+
translations: string;
33+
}
34+
35+
export default function Audit({ audits }: AuditPropsType) {
36+
const [reportData, setReportData] = useState({ columns: [], rows: [] });
37+
38+
//TODO find a better way for dynamic layouts
39+
function getWidth(columnName: string = "") {
40+
switch (columnName) {
41+
case "id":
42+
return 20;
43+
break;
44+
case "eventType":
45+
return 150;
46+
break;
47+
case "eventContent":
48+
return 280;
49+
break;
50+
default:
51+
return 150;
52+
}
53+
}
54+
55+
useEffect(() => {
56+
const colTitles = audits[0];
57+
const fields = Object.keys(colTitles) as any;
58+
const columns = fields.map((f: string) => {
59+
const fieldTranslation = (translations as any)["audits"][f];
60+
const col = {
61+
field: f,
62+
headerName: fieldTranslation,
63+
width: getWidth(f),
64+
};
65+
return col;
66+
});
67+
68+
if (audits && audits.length > 0) {
69+
const rows = audits.map((r: any) => {
70+
const rowCopy = {
71+
id: r.id,
72+
...r,
73+
};
74+
//console.log("Row Copy", rowCopy);
75+
return rowCopy;
76+
});
77+
//console.log("columns", columns);
78+
if (rows) {
79+
setReportData({ columns: columns, rows: rows as any }); //TODO do TS magic
80+
}
81+
}
82+
}, []);
83+
84+
return (
85+
<Layout>
86+
<ThemeProvider theme={theme}>
87+
<Box
88+
sx={{
89+
backgroundColor: "#CFCFCF",
90+
width: "100%",
91+
mt: 5,
92+
}}
93+
>
94+
<DataGrid
95+
autoHeight
96+
columns={reportData.columns}
97+
rows={reportData.rows}
98+
slots={{ toolbar: GridToolbar }}
99+
/>
100+
</Box>
101+
</ThemeProvider>
102+
</Layout>
103+
);
104+
}
105+
106+
export async function getServerSideProps() {
107+
const allAudits = await getAllAudit(prisma);
108+
109+
const audits = allAudits.map((a: AuditType) => {
110+
const newAudit = { ...a } as any; //define a better type there with conversion of Date to string
111+
newAudit.createdAt = convertDateToTimeString(a.createdAt);
112+
newAudit.updatedAt = convertDateToTimeString(a.updatedAt);
113+
return newAudit;
114+
});
115+
116+
//console.log(allRentals);
117+
118+
// Pass data to the page via props
119+
return { props: { audits } };
120+
}

0 commit comments

Comments
 (0)