From 373908d3875ca717c1ab6e99153d65e9558b9770 Mon Sep 17 00:00:00 2001 From: Tim Howitz Date: Mon, 26 May 2025 14:09:06 +0100 Subject: [PATCH] Made some fixes --- package-lock.json | 8 ++++---- package.json | 2 +- public/Scientists.csv | 2 +- public/Users.csv | 8 ++++---- src/app/api/import-scientists/route.ts | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d202f0..ee0daed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "react-leaflet": "^5.0.0", "react-node": "^1.0.2", "swr": "^2.3.3", - "zod": "^3.25.3" + "zod": "^3.25.28" }, "devDependencies": { "@eslint/eslintrc": "^3", @@ -8095,9 +8095,9 @@ } }, "node_modules/zod": { - "version": "3.25.3", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.3.tgz", - "integrity": "sha512-VGZqnyYNrl8JpEJRZaFPqeVNIuqgXNu4cXZ5cOb6zEUO1OxKbRnWB4UdDIXMmiERWncs0yDQukssHov8JUxykQ==", + "version": "3.25.28", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.28.tgz", + "integrity": "sha512-/nt/67WYKnr5by3YS7LroZJbtcCBurDKKPBPWWzaxvVCGuG/NOsiKkrjoOhI8mJ+SQUXEbUzeB3S+6XDUEEj7Q==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" diff --git a/package.json b/package.json index b6020f9..5c8e561 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "react-leaflet": "^5.0.0", "react-node": "^1.0.2", "swr": "^2.3.3", - "zod": "^3.25.3" + "zod": "^3.25.28" }, "devDependencies": { "@eslint/eslintrc": "^3", diff --git a/public/Scientists.csv b/public/Scientists.csv index 0f28d60..148f6d7 100644 --- a/public/Scientists.csv +++ b/public/Scientists.csv @@ -5,7 +5,7 @@ Dr. Izzy Patterson,Senior,None Dr. Hiroshi Takeda,Senior,None Dr. Miriam Hassan,Senior,None Dr. Alice Johnson,Senior,None -Dr. Natalia Petrova,Junior,Dr. Izzy Patteron +Dr. Natalia Petrova,Junior,Dr. Izzy Patterson Dr. Li Cheng,Junior,Dr. Rajiv Menon Dr. Javier Ortega,Junior,Dr. Izzy Patterson Dr. Priya Sharma,Junior,Dr. Hiroshi Takeda diff --git a/public/Users.csv b/public/Users.csv index 5b41db0..b5f5768 100644 --- a/public/Users.csv +++ b/public/Users.csv @@ -1,16 +1,16 @@ id,createdAt,Name,Email,PasswordHash,Role,Scientist,PurchasedArtefacts,Requests -1,2024-05-01T09:00:00,Dr. Emily Neighbour Carter,emily.carter@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] +1,2024-05-01T09:00:00,Dr. Emily Neighbour Carter,emily.neighbour@dyson.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 2,2024-05-01T09:05:00,Dr. Rajiv Menon,rajiv.menon@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] -3,2024-05-01T09:10:00,Dr. Izzy Patterson,izzy.patterson@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] +3,2024-05-01T09:10:00,Dr. Izzy Patterson,izzy.patterson@dyson.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 4,2024-05-01T09:15:00,Dr. Hiroshi Takeda,hiroshi.takeda@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 5,2024-05-01T09:20:00,Dr. Miriam Hassan,miriam.hassan@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 6,2024-05-01T09:25:00,Dr. Alice Johnson,alice.johnson@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] -7,2024-05-01T09:30:00,Tim Howitz,tim.howitz@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,ADMIN,null,[],[] +7,2024-05-01T09:30:00,Tim Howitz,tim.howitz@dyson.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,ADMIN,null,[],[] 8,2024-05-01T09:35:00,Dr. Natalia Petrova,natalia.petrova@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 9,2024-05-01T09:40:00,Dr. Li Cheng,li.cheng@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 10,2024-05-01T09:45:00,Dr. Javier Ortega,javier.ortega@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 11,2024-05-01T09:50:00,Dr. Priya Sharma,priya.sharma@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] -12,2024-05-01T09:55:00,Dr. Lukeshan Thananchayan,lukeshan.thananchayan@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] +12,2024-05-01T09:55:00,Dr. Lukeshan Thananchayan,lukeshan.thananchayan@dyson.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 13,2024-05-01T10:00:00,Dr. Elena Fischer,elena.fischer@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 14,2024-05-01T10:05:00,Dr. Mohammed Al-Farsi,mohammed.alfarsi@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] 15,2024-05-01T10:10:00,Dr. Jane Wong,jane.wong@example.com,$2b$10$edPB/.npmb4FgU.rIoliMOE7JZrxYlRsNmbRXBMgqxVXw9LKdbpSW,SCIENTIST,null,[],[] diff --git a/src/app/api/import-scientists/route.ts b/src/app/api/import-scientists/route.ts index f4a3bcb..279e16e 100644 --- a/src/app/api/import-scientists/route.ts +++ b/src/app/api/import-scientists/route.ts @@ -2,8 +2,9 @@ import { parse } from "csv-parse/sync"; import fs from "fs/promises"; import { NextResponse } from "next/server"; import path from "path"; -import { prisma } from "@utils/prisma"; + import { getRandomNumber } from "@utils/maths"; +import { prisma } from "@utils/prisma"; const csvFilePath = path.resolve(process.cwd(), "public/scientists.csv");