@internetderdinge/api 1.229.10 → 1.229.17

package/src/pdf/pdf.service.ts

@@ -1,41 +1,49 @@
 import puppeteer from "puppeteer";
 import { v4 as uuidv4 } from "uuid";
-import AWS from "aws-sdk";
+import {
+  GetObjectCommand,
+  PutObjectCommand,
+  S3Client,
+} from "@aws-sdk/client-s3";
+import { getSignedUrl as getS3SignedUrl } from "@aws-sdk/s3-request-presigner";
 import path from "path";
 
-// Configure AWS SDK
-const s3 = new AWS.S3({
-  accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-  secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+const s3 = new S3Client({
   region: process.env.AWS_REGION,
+  credentials:
+    process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
+      ? {
+          accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+          secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        }
+      : undefined,
 });
 
 // Function to upload a file to S3
 const uploadBuffer = async (
   buffer: Buffer,
   fileName: string,
-): Promise<string> => {
-  const params = {
-    Bucket: process.env.AWS_S3_BUCKET_NAME!,
-    Key: fileName,
-    Body: buffer,
-    ContentType: "application/pdf",
-    ACL: "private",
-  };
-
-  const data = await s3.upload(params).promise();
-  return data.Location;
+): Promise<void> => {
+  await s3.send(
+    new PutObjectCommand({
+      Bucket: process.env.AWS_S3_BUCKET_NAME!,
+      Key: fileName,
+      Body: buffer,
+      ContentType: "application/pdf",
+    }),
+  );
 };
 
 // Generate a signed URL
-const generateSignedUrl = (fileName: string): string => {
-  const params = {
-    Bucket: process.env.AWS_S3_BUCKET_NAME!,
-    Key: fileName,
-    Expires: 60 * 60, // URL expiration time in seconds
-  };
-
-  return s3.getSignedUrl("getObject", params);
+const generateSignedUrl = async (fileName: string): Promise<string> => {
+  return getS3SignedUrl(
+    s3,
+    new GetObjectCommand({
+      Bucket: process.env.AWS_S3_BUCKET_NAME!,
+      Key: fileName,
+    }),
+    { expiresIn: 60 * 60 },
+  );
 };
 
 interface GeneratePdfOptions {
@@ -79,15 +87,12 @@ const generatePdfFromUrl = async ({
 
   await browser.close();
 
-  const fileUrl = await uploadBuffer(
-    Buffer.from(pdf),
-    `download-${uuidv4()}.pdf`,
-  );
+  const fileName = `download-${uuidv4()}.pdf`;
+  await uploadBuffer(Buffer.from(pdf), fileName);
 
-  console.log(`File uploaded successfully. File URL: ${fileUrl}`);
+  console.log(`File uploaded successfully. File Name: ${fileName}`);
 
-  const fileName = path.basename(fileUrl);
-  const signedUrl = generateSignedUrl(fileName);
+  const signedUrl = await generateSignedUrl(path.basename(fileName));
   console.log(`Signed URL: ${signedUrl}`);
 
   return signedUrl;

package/src/users/users.schemas.ts

@@ -1,5 +1,5 @@
-import { z } from 'zod';
-import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
+import { z } from "zod";
+import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
 extendZodWithOpenApi(z);
 
 export const createUserResponseSchema = z.object({
@@ -13,7 +13,7 @@ export const getUsersResponseSchema = z.array(
     id: z.string(),
     name: z.string(),
     email: z.string(),
-  })
+  }),
 );
 
 export const updateUserSchema = z.object({
@@ -30,50 +30,3 @@ export const updateUserResponseSchema = z.object({
 export const deleteUserResponseSchema = z.object({
   success: z.boolean(),
 });
-
-export const updateTimesByIdResponseSchema = z
-  .array(
-    z.object({
-      rrule: z
-        .object({
-          freq: z.string().optional().openapi({ example: 'DAILY', description: 'Recurrence frequency' }),
-          byweekday: z
-            .array(z.number())
-            .openapi({ example: [0, 1, 2, 6, 3], description: 'Days of week to repeat (0=Sunday)' }),
-          exclude: z.array(z.string()).openapi({ example: ['2024-03-28T10:45:00.000Z'], description: 'Dates to skip' }),
-        })
-        .openapi({ description: 'Recurrence rule object' }),
-      medication: z.string().optional().openapi({ example: '6152c5f3902e7f91374d9f75', description: 'Medication ObjectId' }),
-      patient: z.string().openapi({ example: '614fb1d709dd9f6de85d6374', description: 'Patient ObjectId' }),
-      date: z.string().openapi({ example: '2024-03-25T00:30:00.000Z', description: 'Scheduled date/time (ISO)' }),
-      timeCategory: z.string().openapi({ example: 'noon', description: 'Time category (e.g. morning, noon)' }),
-      amount: z.number().openapi({ example: 1, description: 'Dosage amount' }),
-      emptyStomach: z.boolean().openapi({ example: false, description: 'Whether to take on empty stomach' }),
-      instruction: z.string().optional().openapi({ example: '', description: 'Additional instructions' }),
-      unit: z.string().optional().openapi({ example: 'St', description: 'Dosage unit' }),
-      bake: z.boolean().openapi({ example: false, description: 'Baking flag (if applicable)' }),
-      id: z.string().openapi({ example: '660079fd11fdc2dd935e43af', description: 'Entry identifier' }),
-    })
-  )
-  .openapi({
-    example: [
-      {
-        rrule: {
-          freq: 'DAILY',
-          byweekday: [0, 1, 2, 6, 3],
-          exclude: ['2024-03-28T10:45:00.000Z'],
-        },
-        patient: '614fb1d709dd9f6de85d6374',
-        date: '2024-03-25T00:30:00.000Z',
-        timeCategory: 'noon',
-        amount: 1,
-        emptyStomach: false,
-        instruction: '',
-        unit: 'St',
-        bake: false,
-        id: '660079fd11fdc2dd935e43af',
-      },
-      // ...other items
-    ],
-    description: 'Array of updated time entries by ID',
-  });

package/src/users/users.service.ts

@@ -406,6 +406,7 @@ export default {
   sendEmail,
   populateAuth0User,
   populateAuth0Users,
+  setUpdateTimesByIdHook,
 };
 
 export type UserService = typeof import("./users.service");