24 proof of concept for S3 upload. commented out validation

api/src/lib/aws.ts

@@ -10,6 +10,9 @@ import {
   SQSClient,
 } from '@aws-sdk/client-sqs'
 import { getSignedUrl as awsGetSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { CreateUploadInput } from 'types/graphql'
+
+const CPF_REPORTER_BUCKET_NAME = 'cpf-reporter'
 
 function getS3Client() {
   let s3: S3Client
@@ -38,7 +41,16 @@ function getS3Client() {
   return s3
 }
 
-export async function sendPutObjectToS3Bucket(
+export function uploadWorkbook(
+  upload: CreateUploadInput,
+  uploadId: number,
+  body: any
+) {
+  const folderName = `${upload.organizationId}/${upload.agencyId}/${upload.reportingPeriodId}/uploads/${upload.expenditureCategoryId}/${uploadId}/${upload.filename}`
+  return sendPutObjectToS3Bucket(CPF_REPORTER_BUCKET_NAME, folderName, body)
+}
+
+async function sendPutObjectToS3Bucket(
   bucketName: string,
   key: string,
   body: any

api/src/services/uploads/uploads.ts

@@ -4,9 +4,8 @@ import type {
   UploadRelationResolvers,
 } from 'types/graphql'
 
+import { uploadWorkbook } from 'src/lib/aws'
 import { db } from 'src/lib/db'
-import { validateUpload } from 'src/lib/validate-upload'
-
 export const uploads: QueryResolvers['uploads'] = () => {
   return db.upload.findMany()
 }
@@ -17,11 +16,18 @@ export const upload: QueryResolvers['upload'] = ({ id }) => {
   })
 }
 
-export const createUpload: MutationResolvers['createUpload'] = ({ input }) => {
-  validateUpload(input, context.currentUser)
-  return db.upload.create({
+export const createUpload: MutationResolvers['createUpload'] = async ({
+  input,
+}) => {
+  // validateUpload(input, context.currentUser)
+  const upload = await db.upload.create({
     data: input,
   })
+  console.log('input', input)
+  console.log('upload', upload)
+  await uploadWorkbook(upload, upload.id, 'Hello World')
+
+  return upload
 }
 
 export const updateUpload: MutationResolvers['updateUpload'] = ({

web/src/components/Upload/UploadForm/UploadForm.tsx

@@ -6,7 +6,7 @@ import {
   Form,
   FileField,
   SelectField,
-  HiddenField,
+  // HiddenField,
   FormError,
   FieldError,
   Label,
@@ -15,11 +15,11 @@ import {
 } from '@redwoodjs/forms'
 import type { RWGqlError } from '@redwoodjs/forms'
 
-type FormUpload = NonNullable<EditUploadById['upload']>
+// type FormUpload = NonNullable<EditUploadById['upload']>
 
 interface UploadFormProps {
   upload?: EditUploadById['upload']
-  onSave: (data: UpdateUploadInput, id?: FormUpload['id']) => void
+  onSave: (data: UpdateUploadInput) => void
   error: RWGqlError
   loading: boolean
 }
@@ -31,8 +31,16 @@ const UploadForm = (props: UploadFormProps) => {
     data.filename = data.file[0].name
     data.agencyId = parseInt(data.agencyId)
     data.reportingPeriodId = parseInt(data.reportingPeriodId)
-    console.log(data)
-    props.onSave({ filename: data.file[0].name }, props?.upload?.id)
+    // console.log(data)
+
+    props.onSave({
+      uploadedById: 1,
+      agencyId: 1,
+      filename: data.file[0].name,
+      organizationId: 1,
+      reportingPeriodId: data.reportingPeriodId,
+      expenditureCategoryId: 1,
+    })
   }
 
   const onReset = () => {