Merge pull request #260 from bipproduction/amalia/26-september-24

Amalia/26 september 24

src/app/api/calender/history/route.ts

@@ -5,7 +5,7 @@ import { funGetUserByCookies } from "@/module/auth";
 import { prisma } from "@/module/_global";
 import _ from "lodash";
 
-// GET HSITORY 
+// GET HISTORY 
 export async function GET(request: Request) {
     try {
         const user = await funGetUserByCookies()
@@ -33,6 +33,9 @@ export async function GET(request: Request) {
                 where: {
                     isActive: true,
                     idDivision: idDivision,
+                    dateEnd: {
+                        lte: new Date()
+                    },
                     DivisionCalendar: {
                         title: {
                             contains: (name == undefined || name == "null") ? "" : name,

src/app/api/document/route.ts

@@ -110,6 +110,7 @@ export async function GET(request: Request) {
                select: {
                   DivisionDocumentFolderFile: {
                      select: {
+                        idStorage: true, 
                         id: true,
                         category: true,
                         name: true,
@@ -129,7 +130,7 @@ export async function GET(request: Request) {
 
             formatDataShare = dataShare.map((v: any) => ({
                ..._.omit(v, ["DivisionDocumentFolderFile"]),
-               idStorage: '',
+               idStorage: v.DivisionDocumentFolderFile.idStorage,
                id: v.DivisionDocumentFolderFile.id,
                category: v.DivisionDocumentFolderFile.category,
                name: v.DivisionDocumentFolderFile.name,