Merge pull request #180 from JumboCode/main

Sync Upstream

prisma/schema.prisma

@@ -103,7 +103,7 @@ model Senior {
 
 model File {
   id       String   @id @default(auto()) @map("_id") @db.ObjectId
-  date     DateTime // will zero out the hours
+  date     DateTime @db.Date // will zero out the hours
   filetype String
 
   // Use with Google API

src/app/api/file/[fileId]/route.ts

@@ -8,6 +8,7 @@ import { prisma } from "@server/db/client";
 import { withSession } from "@server/decorator";
 import { driveV3 } from "@server/service";
 import moment from "moment";
+import { offSetDateToUTC } from "@utils";
 
 export const PATCH = withSession(async ({ params, session, req }) => {
   const body = await req.json();
@@ -58,8 +59,7 @@ export const PATCH = withSession(async ({ params, session, req }) => {
         { status: 400 }
       );
     }
-
-    const formatted_date = moment(fileData.date).format("L");
+    const formatted_date = moment(offSetDateToUTC(fileData.date)).format("L");
 
     const body = { name: formatted_date };
 

src/app/api/file/route.ts

@@ -5,6 +5,7 @@ import { prisma } from "@server/db/client";
 import { withSession } from "@server/decorator";
 import { driveV3 } from "@server/service";
 import moment from "moment";
+import { offSetDateToUTC } from "@utils";
 
 export const POST = withSession(async (request) => {
   const body = await request.req.json();
@@ -65,7 +66,7 @@ export const POST = withSession(async (request) => {
 
     const parentID = foundSenior.folder;
 
-    const formatted_date = moment(fileData.date).format("L");
+    const formatted_date = moment(offSetDateToUTC(fileData.date)).format("L");
 
     const fileMetadata = {
       name: [formatted_date],

src/components/senior/DisplaySenior.tsx

@@ -2,7 +2,13 @@
 
 import SearchableContainer from "@components/SearchableContainer";
 import { Prisma, User } from "@prisma/client";
-import { compareUser, formatFileDate, fullName, seniorFullName } from "@utils";
+import {
+  compareUser,
+  formatFileDate,
+  fullName,
+  offSetDateToUTC,
+  seniorFullName,
+} from "@utils";
 import { File } from "@components/file";
 import AddFile from "@components/file/AddFile";
 import { v4 as uuid } from "uuid";
@@ -48,7 +54,10 @@ const DisplaySenior = (props: DisplayProps) => {
       seniorId: senior.id,
     });
   };
-
+  const seniorFiles = senior.Files.map((file) => ({
+    ...file,
+    date: offSetDateToUTC(file.date),
+  }));
   return (
     <div className="flex flex-col gap-y-6">
       <h1 className="text-4xl font-bold text-[#000022]">
@@ -79,7 +88,7 @@ const DisplaySenior = (props: DisplayProps) => {
             setFileEdit={canAddFile ? setFileEdit : undefined}
           />
         )}
-        elements={senior.Files.sort(
+        elements={seniorFiles.sort(
           (fileA, fileB) => fileA.date.getTime() - fileB.date.getTime()
         )}
         search={(file, filter) => formatFileDate(file.date).includes(filter)}
@@ -88,7 +97,7 @@ const DisplaySenior = (props: DisplayProps) => {
             <AddFile
               seniorId={senior.id}
               seniorFolder={senior.folder}
-              files={senior.Files}
+              files={seniorFiles}
               key={addFileId}
               editFile={editFile}
               setEditFile={setFileEdit}

src/components/user/AddFile.tsx

@@ -96,6 +96,7 @@ const AddFile = ({
 }: AddFileProps) => {
   const currFiles = Object.values(files);
   const excludeDates = currFiles.map((fileObj) => fileObj.date);
+
   const excludedDatesString = excludeDates
     .map((dateObj) => dateObj.toDateString())
     .filter((date) => editFile?.date.toDateString() !== date ?? true);
@@ -105,7 +106,6 @@ const AddFile = ({
   const router = useRouter();
   const [error, setError] = useState<boolean>(false);
   const [selectedTags, setSelectedTags] = useState<TagProps[]>([]);
-
   const handleResetState = () => {
     setStartDate(new Date());
     setSelectedTags([]);
@@ -154,7 +154,6 @@ const AddFile = ({
   }
 
   return !error ? (
-    // <Popup className="h-[32rem] w-full overflow-y-auto sm:h-[44rem] sm:w-[36rem]">
     <Popup className="h-fit w-full overflow-y-auto sm:w-[36rem]">
       <div className="flex-col justify-between rounded-[16px] text-white">
         <div className="mb-5 text-2xl font-bold">Create New File</div>

src/server/model/index.ts

@@ -13,10 +13,13 @@ export const seniorSchema = z.object({
   ChapterID: z.string(),
 }) satisfies z.ZodType<Senior>;
 
+/*  https://stackoverflow.com/questions/49407453/setting-sethours-zero-not-working-in-nodejs 
+    Stores Date object at 0:00:00 UTC time
+*/
 export const File = z.object({
   date: z.string().transform((val) => {
     const date = new Date(val);
-    date.setHours(0, 0, 0, 0);
+    date.setUTCHours(0, 0, 0, 0);
     return date;
   }),
   filetype: z.string(),

src/utils/index.tsx

@@ -86,3 +86,7 @@ export const sortedStudents = (students: User[]) => {
 
   return students.sort(comparePositions);
 };
+
+export const offSetDateToUTC = (date: Date) => {
+  return new Date(date.getTime() + date.getTimezoneOffset() * 60000);
+};