@amohamud23/notihub 1.0.149 → 1.0.151

package/dist/index.cjs

@@ -527,17 +527,23 @@ var DocumentNotFoundException = class _DocumentNotFoundException extends Error {
 // src/client/DynamoDBClient.ts
 var import_client_dynamodb = require("@aws-sdk/client-dynamodb");
 var import_lib_dynamodb = require("@aws-sdk/lib-dynamodb");
-var REGION = process.env.AWS_REGION || "us-west-2";
+var isOffline = process.env.IS_OFFLINE === "true";
 var ddbClient = new import_client_dynamodb.DynamoDBClient({
-  region: REGION,
-  maxAttempts: 3
-  // Retry config
+  region: "localhost",
+  endpoint: "http://localhost:8000",
+  credentials: {
+    accessKeyId: "DEFAULT_ACCESS_KEY",
+    // needed if you don't have aws credentials at all in env
+    secretAccessKey: "DEFAULT_SECRET"
+    // needed if you don't have aws credentials at all in env
+  }
 });
 var ddbDocClient = import_lib_dynamodb.DynamoDBDocumentClient.from(ddbClient, {
   marshallOptions: {
     removeUndefinedValues: true
   }
 });
+var USER_TABLE_NAME = process.env.USER_TABLE_NAME || "NotiHub-Users-v1-dev";
 
 // src/DynamoModels/UserModel.ts
 var import_lib_dynamodb2 = require("@aws-sdk/lib-dynamodb");
@@ -546,7 +552,7 @@ var User = class _User {
   /**
    * The name of the DynamoDB table for users.
    */
-  static TABLE_NAME = `NotiHub-Users-${_User.ENV}`;
+  static TABLE_NAME = `NotiHub-Users-v1-${_User.ENV}`;
   /**
    * Retrieves a user by their ID.
    * @param id - The ID of the user to retrieve.
@@ -571,13 +577,17 @@ var User = class _User {
    * @returns A promise that resolves to the user object or null if not found.
    */
   static async getUserByEmail(email) {
-    const command = new import_lib_dynamodb2.GetCommand({
+    const command = new import_lib_dynamodb2.QueryCommand({
       TableName: _User.TABLE_NAME,
-      Key: { email }
+      IndexName: "EmailIndex",
+      KeyConditionExpression: "email = :email",
+      ExpressionAttributeValues: {
+        ":email": email
+      }
     });
     try {
       const result = await ddbDocClient.send(command);
-      return result.Item || null;
+      return result.Items || null;
     } catch (error) {
       console.error(`Error fetching user by email: ${email}`, error);
       throw new Error("Could not fetch user by email");
@@ -617,7 +627,7 @@ var User = class _User {
       await ddbDocClient.send(command);
       return user;
     } catch (error) {
-      console.error("Error updating user:", error);
+      console.error("Error updating user: ", error);
       throw new Error("Could not update user");
     }
   }

package/dist/index.d.cts

@@ -83,7 +83,7 @@ type INotiHubNotificationStats = {
     views: number;
 };
 type INotiHubUser = {
-    _id?: string;
+    id: string;
     pushToken: string;
     name: string;
     email: string;
@@ -205,9 +205,9 @@ declare function getDate(dateStr: string): string;
 declare function getDateFormat(dateStr: string): string;
 declare function addMonths({ date, months }: AddMonths): Date;
 
-declare const UserModel: mongoose.Model<INotiHubUser, {}, {}, {}, mongoose.Document<unknown, {}, INotiHubUser> & INotiHubUser & Required<{
-    _id: string;
-}> & {
+declare const UserModel: mongoose.Model<INotiHubUser, {}, {}, {}, mongoose.Document<unknown, {}, INotiHubUser> & INotiHubUser & {
+    _id: mongoose.Types.ObjectId;
+} & {
     __v?: number;
 }, any>;
 
@@ -324,7 +324,7 @@ declare class User {
      * @param email - The email of the user to retrieve.
      * @returns A promise that resolves to the user object or null if not found.
      */
-    static getUserByEmail(email: string): Promise<INotiHubUser | null>;
+    static getUserByEmail(email: string): Promise<INotiHubUser[] | null>;
     /**
      * Creates a new user.
      * @param user - The user object to create.

package/dist/index.d.ts

@@ -83,7 +83,7 @@ type INotiHubNotificationStats = {
     views: number;
 };
 type INotiHubUser = {
-    _id?: string;
+    id: string;
     pushToken: string;
     name: string;
     email: string;
@@ -205,9 +205,9 @@ declare function getDate(dateStr: string): string;
 declare function getDateFormat(dateStr: string): string;
 declare function addMonths({ date, months }: AddMonths): Date;
 
-declare const UserModel: mongoose.Model<INotiHubUser, {}, {}, {}, mongoose.Document<unknown, {}, INotiHubUser> & INotiHubUser & Required<{
-    _id: string;
-}> & {
+declare const UserModel: mongoose.Model<INotiHubUser, {}, {}, {}, mongoose.Document<unknown, {}, INotiHubUser> & INotiHubUser & {
+    _id: mongoose.Types.ObjectId;
+} & {
     __v?: number;
 }, any>;
 
@@ -324,7 +324,7 @@ declare class User {
      * @param email - The email of the user to retrieve.
      * @returns A promise that resolves to the user object or null if not found.
      */
-    static getUserByEmail(email: string): Promise<INotiHubUser | null>;
+    static getUserByEmail(email: string): Promise<INotiHubUser[] | null>;
     /**
      * Creates a new user.
      * @param user - The user object to create.

package/dist/index.js

@@ -475,23 +475,30 @@ var DocumentNotFoundException = class _DocumentNotFoundException extends Error {
 // src/client/DynamoDBClient.ts
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient } from "@aws-sdk/lib-dynamodb";
-var REGION = process.env.AWS_REGION || "us-west-2";
+var isOffline = process.env.IS_OFFLINE === "true";
 var ddbClient = new DynamoDBClient({
-  region: REGION,
-  maxAttempts: 3
-  // Retry config
+  region: "localhost",
+  endpoint: "http://localhost:8000",
+  credentials: {
+    accessKeyId: "DEFAULT_ACCESS_KEY",
+    // needed if you don't have aws credentials at all in env
+    secretAccessKey: "DEFAULT_SECRET"
+    // needed if you don't have aws credentials at all in env
+  }
 });
 var ddbDocClient = DynamoDBDocumentClient.from(ddbClient, {
   marshallOptions: {
     removeUndefinedValues: true
   }
 });
+var USER_TABLE_NAME = process.env.USER_TABLE_NAME || "NotiHub-Users-v1-dev";
 
 // src/DynamoModels/UserModel.ts
 import {
   DeleteCommand,
   GetCommand,
   PutCommand,
+  QueryCommand,
   UpdateCommand
 } from "@aws-sdk/lib-dynamodb";
 var User = class _User {
@@ -499,7 +506,7 @@ var User = class _User {
   /**
    * The name of the DynamoDB table for users.
    */
-  static TABLE_NAME = `NotiHub-Users-${_User.ENV}`;
+  static TABLE_NAME = `NotiHub-Users-v1-${_User.ENV}`;
   /**
    * Retrieves a user by their ID.
    * @param id - The ID of the user to retrieve.
@@ -524,13 +531,17 @@ var User = class _User {
    * @returns A promise that resolves to the user object or null if not found.
    */
   static async getUserByEmail(email) {
-    const command = new GetCommand({
+    const command = new QueryCommand({
       TableName: _User.TABLE_NAME,
-      Key: { email }
+      IndexName: "EmailIndex",
+      KeyConditionExpression: "email = :email",
+      ExpressionAttributeValues: {
+        ":email": email
+      }
     });
     try {
       const result = await ddbDocClient.send(command);
-      return result.Item || null;
+      return result.Items || null;
     } catch (error) {
       console.error(`Error fetching user by email: ${email}`, error);
       throw new Error("Could not fetch user by email");
@@ -570,7 +581,7 @@ var User = class _User {
       await ddbDocClient.send(command);
       return user;
     } catch (error) {
-      console.error("Error updating user:", error);
+      console.error("Error updating user: ", error);
       throw new Error("Could not update user");
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amohamud23/notihub",
-  "version": "1.0.149",
+  "version": "1.0.151",
   "description": "Notihub Package",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.cts",