diff --git a/apps/api/src/aws/aws.service.ts b/apps/api/src/aws/aws.service.ts
index e6046ef4..12f2243e 100644
--- a/apps/api/src/aws/aws.service.ts
+++ b/apps/api/src/aws/aws.service.ts
@@ -22,9 +22,13 @@ export class AwsService {
   constructor() {}
 
   async uploadFileToS3(fileName: string, file: Buffer, folderName?: string) {
+    const MAX_UPLOAD_SIZE = 1024 * 1024 * 10; // 10MB
     const currentDate = new Date();
     const dateWithTimestamp = currentDate.toISOString();
     const fileType = '.' + fileName.split('.').pop();
+
+    if (file.byteLength > MAX_UPLOAD_SIZE) throw new Error('ไฟล์ใหญ่เกิน 10MB');
+
     // '{2024-09-05T16:19:34.142Z}-' has 27 characters
     const truncatedFileName = truncateTextByBytes(
       fileName.slice(0, -fileType.length),
diff --git a/apps/api/src/user-filing/user-filing.service.ts b/apps/api/src/user-filing/user-filing.service.ts
index 380f7424..0e92ece0 100644
--- a/apps/api/src/user-filing/user-filing.service.ts
+++ b/apps/api/src/user-filing/user-filing.service.ts
@@ -37,7 +37,7 @@ export class UserFilingService {
     return userFilings;
   }
 
-  async userOpenFiling(userId: string, filingId: string): Promise<UserFiling> {
+  async userOpenFiling(userId: string, filingId: string) {
     if (!isUUID(userId) || !isUUID(filingId)) {
       throw new BadRequestException('Id is not in UUID format');
     }
@@ -58,6 +58,9 @@ export class UserFilingService {
       lastOpen: new Date(),
     };
 
-    return await this.userFilingRepository.save(preparedUserFiling);
+    return await this.userFilingRepository.upsert(preparedUserFiling, {
+      conflictPaths: ['user', 'filing'],
+      skipUpdateIfNoValuesChanged: true,
+    });
   }
 }
diff --git a/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx b/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx
index 9f26d562..8169e958 100644
--- a/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx
+++ b/apps/web/src/app/(authenticated)/project/[projectId]/[filingId]/page.tsx
@@ -19,6 +19,7 @@ import updateFilingName from '@/src/service/filing/updateFiling';
 import { isUUID } from '@/src/lib/utils';
 import getUsersMap from '@/src/service/user/getUsersMap';
 import { getUserId } from '@/src/service/auth';
+import userOpenFiling from '@/src/service/user-filing/userOpenFiling';
 
 export default function Page({
   params,
@@ -62,11 +63,13 @@ export default function Page({
       if (filingData) setFiling(filingData);
       if (latestDocumentData) setLatestDocument(latestDocumentData);
 
-      if (documentsData.length === 0) return;
-      setDocuments(documentsData);
-
-      const updatedUsernameMap = await getUsersMap(documentsData, userId);
+      const [updatedUsernameMap] = await Promise.all([
+        getUsersMap(documentsData, userId),
+        userOpenFiling(userId, params.filingId),
+      ]);
       setUsernameMap(updatedUsernameMap);
+
+      if (documentsData.length > 0) setDocuments(documentsData);
     } catch (err) {
       if (err instanceof Error) {
         toast({
diff --git a/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx b/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx
index b803037a..b54397b7 100644
--- a/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx
+++ b/apps/web/src/app/admin/project/[projectId]/[filingId]/page.tsx
@@ -19,6 +19,7 @@ import updateFilingName from '@/src/service/filing/updateFiling';
 import { isUUID } from '@/src/lib/utils';
 import { getUserId } from '@/src/service/auth';
 import getUsersMap from '@/src/service/user/getUsersMap';
+import userOpenFiling from '@/src/service/user-filing/userOpenFiling';
 
 export default function Page({
   params,
@@ -62,11 +63,13 @@ export default function Page({
       if (filingData) setFiling(filingData);
       if (latestDocumentData) setLatestDocument(latestDocumentData);
 
-      if (documentsData.length === 0) return;
-      setDocuments(documentsData);
-
-      const updatedUsernameMap = await getUsersMap(documentsData, userId);
+      const [updatedUsernameMap] = await Promise.all([
+        getUsersMap(documentsData, userId),
+        userOpenFiling(userId, params.filingId),
+      ]);
       setUsernameMap(updatedUsernameMap);
+
+      if (documentsData.length > 0) setDocuments(documentsData);
     } catch (err) {
       if (err instanceof Error) {
         toast({
diff --git a/apps/web/src/components/filling-detail/create-edit/createDocumentClient.tsx b/apps/web/src/components/filling-detail/create-edit/createDocumentClient.tsx
index 49588e0a..0a55f26f 100644
--- a/apps/web/src/components/filling-detail/create-edit/createDocumentClient.tsx
+++ b/apps/web/src/components/filling-detail/create-edit/createDocumentClient.tsx
@@ -18,13 +18,10 @@ import ButtonPanel from './buttonPanel';
 import FileInputPanel from './fileInputPanel';
 import ActivityPanel from './activityPanel';
 import { DocumentType } from '@/src/interface/document';
-import createDocument from '@/src/service/document/createDocument';
-import { DocumentActivity, FilingStatus } from '@/src/constant/enum';
-import { getFileType } from '@/src/lib/utils';
-import updateFilingName from '@/src/service/filing/updateFiling';
+import { FilingStatus } from '@/src/constant/enum';
 import { toast } from '../../ui/use-toast';
-import uploadFileToS3 from '@/src/service/aws/uploadFileToS3';
-import { zodDocumentFiles } from '@/src/constant/schema';
+import { createdFormSchema } from '@/src/constant/schema';
+import submitCreatedFormSchema from '@/src/lib/submitCreatedFormSchema';
 
 export default function CreateDocumentClient({
   setShowCreateDocument,
@@ -39,14 +36,6 @@ export default function CreateDocumentClient({
   projectId: string;
   status: FilingStatus;
 }) {
-  const createdFormSchema = z.object({
-    // Server side ไม่รู้จัก FileList ***
-    file: zodDocumentFiles,
-    activity: z.nativeEnum(DocumentActivity, { message: 'กรุณากรอกกิจกรรม' }),
-    detail: z.string().min(1, { message: 'กรุณากรอกรายละเอียด' }),
-    note: z.string().optional(),
-  });
-
   const form = useForm<z.infer<typeof createdFormSchema>>({
     resolver: zodResolver(createdFormSchema),
     defaultValues: {
@@ -59,44 +48,14 @@ export default function CreateDocumentClient({
   async function onSubmit(values: z.infer<typeof createdFormSchema>) {
     // TODO: change to actual userId
     try {
-      const swap = getFileType(values.file[0]) !== 'pdf';
-      const pdfFile = values.file[swap ? 1 : 0];
-      const docFile = values.file[swap ? 0 : 1];
-      const folderName = `${projectId}/${filingId}`;
-
-      const [pdfName, docName] = await Promise.all([
-        uploadFileToS3({
-          file: pdfFile,
-          folderName,
-        }),
-        docFile &&
-          uploadFileToS3({
-            file: docFile,
-            folderName,
-          }),
-      ]);
-
-      if (!pdfName || (docFile && !docName))
-        throw new Error('Upload file failed');
+      const newDocument = await submitCreatedFormSchema(
+        values,
+        projectId,
+        filingId,
+        'd1c0d106-1a4a-4729-9033-1b2b2d52e98a',
+        status,
+      );
 
-      const [newDocument, _] = await Promise.all([
-        createDocument({
-          document: {
-            name: values.detail,
-            filingId,
-            pdfName: pdfName,
-            docName: docName ?? '',
-            activity: values.activity as DocumentActivity,
-            userId: 'd1c0d106-1a4a-4729-9033-1b2b2d52e98a',
-            detail: values.note,
-          },
-        }),
-        status === FilingStatus.DRAFT &&
-          updateFilingName({
-            filingId,
-            filingStatus: FilingStatus.DOCUMENT_CREATED,
-          }),
-      ]);
       afterCreateDocument(newDocument);
       toast({
         title: 'สร้างเอกสารสำเร็จ',
diff --git a/apps/web/src/components/filling-detail/create-edit/updateDocumentAdmin.tsx b/apps/web/src/components/filling-detail/create-edit/updateDocumentAdmin.tsx
index 0c974975..5785bf6f 100644
--- a/apps/web/src/components/filling-detail/create-edit/updateDocumentAdmin.tsx
+++ b/apps/web/src/components/filling-detail/create-edit/updateDocumentAdmin.tsx
@@ -17,13 +17,11 @@ import { Select } from '../../ui/select';
 import ButtonPanel from './buttonPanel';
 import FileInputPanel from './fileInputPanel';
 import ActivityPanel from './activityPanel';
-import { getFileType } from '@/src/lib/utils';
 import { DocumentType } from '@/src/interface/document';
 import { DocumentActivity } from '@/src/constant/enum';
 import { toast } from '../../ui/use-toast';
-import uploadFileToS3 from '@/src/service/aws/uploadFileToS3';
-import createDocument from '@/src/service/document/createDocument';
-import { zodDocumentFiles } from '@/src/constant/schema';
+import { createdFormSchema } from '@/src/constant/schema';
+import submitCreatedFormSchema from '@/src/lib/submitCreatedFormSchema';
 
 export default function UpdateDocumentAdmin({
   setShowCreateDocument,
@@ -36,14 +34,6 @@ export default function UpdateDocumentAdmin({
   filingId: string;
   projectId: string;
 }) {
-  const createdFormSchema = z.object({
-    file: zodDocumentFiles,
-    activity: z.nativeEnum(DocumentActivity, { message: 'กรุณากรอกกิจกรรม' }),
-    detail: z.string().min(1, { message: 'กรุณากรอกรายละเอียด' }),
-    note: z.string().optional(),
-    comment: z.string().optional(),
-  });
-
   const form = useForm<z.infer<typeof createdFormSchema>>({
     resolver: zodResolver(createdFormSchema),
     defaultValues: {
@@ -57,38 +47,13 @@ export default function UpdateDocumentAdmin({
   async function onSubmit(values: z.infer<typeof createdFormSchema>) {
     // TODO: change to actual userId
     try {
-      const swap = getFileType(values.file[0]) !== 'pdf';
-      const pdfFile = values.file[swap ? 1 : 0];
-      const docFile = values.file[swap ? 0 : 1];
-      const folderName = `${projectId}/${filingId}`;
-
-      const [pdfName, docName] = await Promise.all([
-        uploadFileToS3({
-          file: pdfFile,
-          folderName,
-        }),
-        docFile &&
-          uploadFileToS3({
-            file: docFile,
-            folderName,
-          }),
-      ]);
+      const newDocument = await submitCreatedFormSchema(
+        values,
+        projectId,
+        filingId,
+        'd1c0d106-1a4a-4729-9033-1b2b2d52e98a',
+      );
 
-      if (!pdfName || (docFile && !docName))
-        throw new Error('Upload file failed');
-
-      const newDocument = await createDocument({
-        document: {
-          name: values.detail,
-          filingId,
-          pdfName: pdfName,
-          docName: docName ?? '',
-          activity: values.activity as DocumentActivity,
-          userId: 'd1c0d106-1a4a-4729-9033-1b2b2d52e98a',
-          detail: values.note,
-          comment: values.comment,
-        },
-      });
       afterCreateDocument(newDocument);
       toast({
         title: 'แก้ไขเอกสารสำเร็จ',
diff --git a/apps/web/src/components/filling-detail/display/displayWithNoteAndStatus.tsx b/apps/web/src/components/filling-detail/display/displayWithNoteAndStatus.tsx
index a00c2725..d49a6619 100644
--- a/apps/web/src/components/filling-detail/display/displayWithNoteAndStatus.tsx
+++ b/apps/web/src/components/filling-detail/display/displayWithNoteAndStatus.tsx
@@ -36,77 +36,75 @@ export default function DisplayWithNoteAndStatus({
   const [isOpen, setIsOpen] = useState(false);
 
   return (
-    <div className="w-full relative">
-      <Collapsible className="bg-gray-100 rounded-lg font-sukhumvit text-xl w-full">
-        <div className="flex flex-row px-8">
-          <NameDate
-            title={user?.username ?? 'Secretary ESC'}
-            date={'ส่งเอกสารเมื่อ ' + convertDate(document.createdAt)}
-            activity={TextDocumentActivity[document.activity]}
-          >
-            <CircleUserRound size={30} className="shrink-0" />
-          </NameDate>
-          <div className="px-8 py-4 font-bold space-y-4 w-[35vw] grow">
-            <div className="font-bold text-sm">ความคิดเห็น</div>
-            <TextareaForDisplay value={document.comment} />
-          </div>
-          <div className="py-8 flex flex-col justify-between w-auto items-end space-y-5">
-            {handleDeleteDocument ? (
-              <DraftDocumentPopover
-                isOpen={isOpen}
-                setIsOpen={setIsOpen}
-                handleDeleteButton={() => {
-                  handleDeleteDocument(document.id);
-                }}
-              />
-            ) : (
-              <StatusButton
-                status={document.status}
-                showReplyButton={showReplyButton}
-                setShowCreateDocument={setShowCreateDocument}
-              />
-            )}
-            <CollapsibleTrigger
-              onClick={() => {
-                setExpanded(!expanded);
+    <Collapsible className="bg-gray-100 rounded-lg font-sukhumvit text-xl w-full">
+      <div className="flex flex-row px-8">
+        <NameDate
+          title={user?.username ?? 'Secretary ESC'}
+          date={`ส่งเอกสารเมื่อ ${convertDate(document.createdAt)}`}
+          activity={TextDocumentActivity[document.activity]}
+        >
+          <CircleUserRound size={30} className="shrink-0" />
+        </NameDate>
+        <div className="px-8 py-4 font-bold space-y-4 w-[35vw] grow">
+          <div className="font-bold text-sm">ความคิดเห็น</div>
+          <TextareaForDisplay value={document.comment} />
+        </div>
+        <div className="py-8 flex flex-col justify-between w-auto items-end space-y-5">
+          {handleDeleteDocument ? (
+            <DraftDocumentPopover
+              isOpen={isOpen}
+              setIsOpen={setIsOpen}
+              handleDeleteButton={() => {
+                handleDeleteDocument(document.id);
               }}
-            >
-              {expanded ? <ChevronUp /> : <ChevronDown />}
-            </CollapsibleTrigger>
-          </div>
+            />
+          ) : (
+            <StatusButton
+              status={document.status}
+              showReplyButton={showReplyButton}
+              setShowCreateDocument={setShowCreateDocument}
+            />
+          )}
+          <CollapsibleTrigger
+            onClick={() => {
+              setExpanded(!expanded);
+            }}
+          >
+            {expanded ? <ChevronUp /> : <ChevronDown />}
+          </CollapsibleTrigger>
         </div>
-        <CollapsibleContent>
-          <div className="border-t-2 px-8 py-4 font-bold text-sm flex flex-col space-y-4 ">
-            <div>
-              <span className="font-bold">รายละเอียดเอกสาร: </span>
-              <span className="font-normal">{document.name}</span>
+      </div>
+      <CollapsibleContent>
+        <div className="border-t-2 px-8 py-4 font-bold text-sm flex flex-col space-y-4 ">
+          <div>
+            <span className="font-bold">รายละเอียดเอกสาร: </span>
+            <span className="font-normal">{document.name}</span>
+          </div>
+          <div className="flex flex-row">
+            <div className="space-y-2 w-[40vw]">
+              <div>หมายเหตุ</div>
+              <TextareaForDisplay value={document.detail} />
             </div>
-            <div className="flex flex-row">
-              <div className="space-y-2">
-                <div>หมายเหตุ</div>
-                <TextareaForDisplay value={document.detail} />
-              </div>
-              <div className="pl-5">
-                <div>ไฟล์แนบ</div>
-                <div className="flex flex-col gap-6 pt-2">
+            <div className="pl-5">
+              <div>ไฟล์แนบ</div>
+              <div className="flex flex-col gap-6 pt-2">
+                <FileDisplay
+                  fileName={document.pdfName}
+                  fileType="pdf"
+                  folderName={folderName}
+                />
+                {document.docName !== '' && document.docName !== '-' && (
                   <FileDisplay
-                    fileName={document.pdfName}
-                    fileType="pdf"
+                    fileName={document.docName}
+                    fileType="doc"
                     folderName={folderName}
                   />
-                  {document.docName !== '' && document.docName !== '-' && (
-                    <FileDisplay
-                      fileName={document.docName}
-                      fileType="doc"
-                      folderName={folderName}
-                    />
-                  )}
-                </div>
+                )}
               </div>
             </div>
           </div>
-        </CollapsibleContent>
-      </Collapsible>
-    </div>
+        </div>
+      </CollapsibleContent>
+    </Collapsible>
   );
 }
diff --git a/apps/web/src/components/filling-detail/filingTimeline.tsx b/apps/web/src/components/filling-detail/filingTimeline.tsx
index 50076748..7914bec6 100644
--- a/apps/web/src/components/filling-detail/filingTimeline.tsx
+++ b/apps/web/src/components/filling-detail/filingTimeline.tsx
@@ -138,11 +138,17 @@ export default function FilingTimeline({
                 ? 'วันนี้'
                 : currentDate}
             </div>
-            <DocumentCard document={document} index={index} />
+            <div key={index} className="w-full relative">
+              <DocumentCard document={document} index={index} />
+            </div>
           </>
         );
       }
-      return <DocumentCard document={document} index={index} />;
+      return (
+        <div key={index} className="w-full relative">
+          <DocumentCard document={document} index={index} />
+        </div>
+      );
     });
 
   return (
diff --git a/apps/web/src/components/filling-detail/filingTimelineHeader.tsx b/apps/web/src/components/filling-detail/filingTimelineHeader.tsx
index 8ae6a68f..0875fbfa 100644
--- a/apps/web/src/components/filling-detail/filingTimelineHeader.tsx
+++ b/apps/web/src/components/filling-detail/filingTimelineHeader.tsx
@@ -10,14 +10,13 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '../ui/dialog';
-import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
-import { useToast } from '../ui/use-toast';
+import { Dispatch, SetStateAction, useMemo, useState } from 'react';
+import { toast } from '../ui/use-toast';
 import updateFilingName from '@/src/service/filing/updateFiling';
 import CreateDocumentClient from './create-edit/createDocumentClient';
 import { DocumentType } from '@/src/interface/document';
 import updateDocument from '@/src/service/document/updateDocument';
 import FilingTimelineHeaderApproved from './filingTimelineHeaderApproved';
-import getUrlToFile from '@/src/service/aws/getUrlToFile';
 import CreateDocumentAdmin from './create-edit/createDocumentAdmin';
 import { Select, SelectContent, SelectItem, SelectTrigger } from '../ui/select';
 import { IoIosAlert } from 'react-icons/io';
@@ -52,9 +51,7 @@ export default function FilingTimelineHeader({
   const [isCancelDialogOpen, setIsCancelDialogOpen] = useState<boolean>(false);
   const [isReviewDialogOpen, setIsReviewDialogOpen] = useState<boolean>(false);
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-  const [pdfLink, setPdfLink] = useState<string | undefined>();
   const [reviewButton, setReviewButton] = useState<string>('อนุมัติ');
-  const { toast } = useToast();
 
   const updateDocumentStatuses = async (
     documents: DocumentType[],
@@ -174,17 +171,6 @@ export default function FilingTimelineHeader({
     }
     setIsSubmitting(false);
   };
-  const fetchPdfLink = async () => {
-    const signedUrl = await getUrlToFile({
-      fileName: latestDocument?.pdfName ?? '',
-      folderName: `${projectId}/${filingId}`,
-    });
-
-    setPdfLink(signedUrl);
-  };
-  useEffect(() => {
-    if (status === FilingStatus.APPROVED && latestDocument) fetchPdfLink();
-  }, [status, latestDocument]);
   const AddDocumentButton = () => (
     <Button
       variant="outline"
@@ -389,11 +375,18 @@ export default function FilingTimelineHeader({
             isAdmin ? (
               <>
                 <AddDocumentButton />
-                <FilingTimelineHeaderApproved pdfLink={pdfLink ?? ''} noBadge />
+                <FilingTimelineHeaderApproved
+                  fileName={latestDocument?.pdfName ?? ''}
+                  folderName={`${projectId}/${filingId}`}
+                  noBadge
+                />
                 <SubmissionButton />
               </>
             ) : (
-              <FilingTimelineHeaderApproved pdfLink={pdfLink ?? ''} />
+              <FilingTimelineHeaderApproved
+                fileName={latestDocument?.pdfName ?? ''}
+                folderName={`${projectId}/${filingId}`}
+              />
             )
           ) : (
             <>
diff --git a/apps/web/src/components/filling-detail/filingTimelineHeaderApproved.tsx b/apps/web/src/components/filling-detail/filingTimelineHeaderApproved.tsx
index 24d74826..d66edbd2 100644
--- a/apps/web/src/components/filling-detail/filingTimelineHeaderApproved.tsx
+++ b/apps/web/src/components/filling-detail/filingTimelineHeaderApproved.tsx
@@ -1,23 +1,33 @@
-import Link from 'next/link';
 import { BiSolidFilePdf } from 'react-icons/bi';
 import { Button } from '../ui/button';
 import { CircleCheck } from 'lucide-react';
+import getUrlToFile from '@/src/service/aws/getUrlToFile';
 
 export default function FilingTimelineHeaderApproved({
-  pdfLink,
+  fileName,
+  folderName,
   noBadge = false,
 }: {
-  pdfLink: string;
+  fileName: string;
+  folderName?: string;
   noBadge?: boolean;
 }) {
+  const handleClick = async () => {
+    const signedUrl = await getUrlToFile({
+      fileName,
+      folderName,
+    });
+    window.open(signedUrl, '_blank');
+  };
   return (
     <>
-      <Link href={pdfLink} rel="noopener noreferrer" target="_blank">
-        <Button className="mx-auto rounded-2xl text-2xl pl-3 pr-4 py-4 h-[52px] font-semibold bg-red text-white">
-          <BiSolidFilePdf className="h-8 w-8 mr-2" />
-          อ่าน
-        </Button>
-      </Link>
+      <Button
+        className="mx-auto rounded-2xl text-2xl pl-3 pr-4 py-4 h-[52px] font-semibold bg-red text-white"
+        onClick={() => handleClick()}
+      >
+        <BiSolidFilePdf className="h-8 w-8 mr-2" />
+        อ่าน
+      </Button>
       {!noBadge && (
         <Button className="pointer-events-none mx-auto rounded-2xl text-2xl pl-3 pr-4 py-4 h-[52px] font-semibold bg-accepted text-white">
           <CircleCheck className="h-8 w-8 mr-2" />
diff --git a/apps/web/src/constant/schema.ts b/apps/web/src/constant/schema.ts
index 0c2c89b0..821b9041 100644
--- a/apps/web/src/constant/schema.ts
+++ b/apps/web/src/constant/schema.ts
@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { projectTypeMap } from './Map';
 import { getFileType } from '../lib/utils';
+import { DocumentActivity } from './enum';
 
 const projectTypes = projectTypeMap.map((item) => item.value.toString());
 
@@ -56,12 +57,22 @@ export const newProjectFormSchema = z.object({
     }),
 });
 
+const MAX_UPLOAD_SIZE = 1024 * 1024 * 10; // 10MB
+
 export const zodDocumentAdminFile = (
   typeof window === 'undefined' ? z.any() : z.instanceof(FileList)
-).refine(
-  (file) => file?.length == 0 || getFileType(file[0]) === 'pdf',
-  'เลือกได้แค่ไฟล์ที่มีนามสกุล .pdf ไฟล์เดียว',
-);
+)
+  .refine(
+    (file) =>
+      file?.length == 0 ||
+      (file?.length == 1 && getFileType(file[0]) === 'pdf'),
+    'เลือกได้แค่ไฟล์ที่มีนามสกุล .pdf ไฟล์เดียว',
+  )
+  .refine(
+    (file: FileList) =>
+      Array.from(file).every((f) => f.size <= MAX_UPLOAD_SIZE),
+    'ไฟล์ใหญ่เกิน 10MB',
+  );
 
 export const zodDocumentFiles = (
   typeof window === 'undefined' ? z.any() : z.instanceof(FileList)
@@ -71,4 +82,17 @@ export const zodDocumentFiles = (
   .refine(
     (file) => getFileType(file[0]) === 'pdf' || getFileType(file[1]) === 'pdf',
     'กรุณาเลือกไฟล์ที่มีนามสกุล .pdf อย่างน้อย 1 ไฟล์',
+  )
+  .refine(
+    (file: FileList) =>
+      Array.from(file).every((f) => f.size <= MAX_UPLOAD_SIZE),
+    'ไฟล์ใหญ่เกิน 10MB',
   );
+
+export const createdFormSchema = z.object({
+  file: zodDocumentFiles,
+  activity: z.nativeEnum(DocumentActivity, { message: 'กรุณากรอกกิจกรรม' }),
+  detail: z.string().min(1, { message: 'กรุณากรอกรายละเอียด' }),
+  note: z.string().optional(),
+  comment: z.string().optional(),
+});
diff --git a/apps/web/src/lib/submitCreatedFormSchema.ts b/apps/web/src/lib/submitCreatedFormSchema.ts
new file mode 100644
index 00000000..e9883190
--- /dev/null
+++ b/apps/web/src/lib/submitCreatedFormSchema.ts
@@ -0,0 +1,57 @@
+import { z } from 'zod';
+import { DocumentActivity, FilingStatus } from '../constant/enum';
+import { createdFormSchema } from '../constant/schema';
+import uploadFileToS3 from '../service/aws/uploadFileToS3';
+import createDocument from '../service/document/createDocument';
+import updateFilingName from '../service/filing/updateFiling';
+import { getFileType } from './utils';
+
+export default async function submitCreatedFormSchema(
+  values: z.infer<typeof createdFormSchema>,
+  projectId: string,
+  filingId: string,
+  userId: string,
+  status?: string,
+) {
+  const swap = getFileType(values.file[0]) !== 'pdf';
+  const pdfFile = values.file[swap ? 1 : 0];
+  const docFile = values.file[swap ? 0 : 1];
+  const folderName = `${projectId}/${filingId}`;
+
+  const [pdfName, docName] = await Promise.all([
+    uploadFileToS3({
+      file: pdfFile,
+      folderName,
+    }),
+    docFile &&
+      uploadFileToS3({
+        file: docFile,
+        folderName,
+      }),
+  ]);
+
+  if (!pdfName || (docFile && !docName)) throw new Error('Upload file failed');
+
+  const [newDocument] = await Promise.all([
+    createDocument({
+      document: {
+        name: values.detail,
+        filingId,
+        pdfName: pdfName,
+        docName: docName ?? '',
+        activity: values.activity as DocumentActivity,
+        userId,
+        detail: values.note,
+        comment: values.comment,
+      },
+    }),
+    status &&
+      status === FilingStatus.DRAFT &&
+      updateFilingName({
+        filingId,
+        filingStatus: FilingStatus.DOCUMENT_CREATED,
+      }),
+  ]);
+
+  return newDocument;
+}
diff --git a/apps/web/src/service/aws/uploadFileToS3.ts b/apps/web/src/service/aws/uploadFileToS3.ts
index fa53eb05..15a174f6 100644
--- a/apps/web/src/service/aws/uploadFileToS3.ts
+++ b/apps/web/src/service/aws/uploadFileToS3.ts
@@ -21,6 +21,6 @@ export default async function uploadFileToS3(obj: {
     return responseJSON.uploadedFileName;
   } catch (e) {
     console.log(e);
-    throw new Error('อัปโหลดไฟล์ไม่สำเร็จ โปรดตรวจสอบว่าชื่อไฟล์ไม่ยาวเกินไป');
+    throw new Error('อัปโหลดไฟล์ไม่สำเร็จ');
   }
 }
diff --git a/apps/web/src/service/user-filing/userOpenFiling.ts b/apps/web/src/service/user-filing/userOpenFiling.ts
new file mode 100644
index 00000000..fb886cbd
--- /dev/null
+++ b/apps/web/src/service/user-filing/userOpenFiling.ts
@@ -0,0 +1,13 @@
+import { trpc } from '../../app/trpc';
+
+export default async function userOpenFiling(userId: string, filingId: string) {
+  try {
+    await trpc.userFiling.userOpenFiling.mutate({
+      userId,
+      filingId,
+    });
+  } catch (err) {
+    console.error(err);
+    throw new Error('ไม่สามารถอัพเดทข้อมูลการเปิดเอกสารได้');
+  }
+}