my-typescript-library-rahul52us 1.3.4 → 1.3.5

package/src/repository/schemas/workflow.schema.ts

@@ -1,71 +1,51 @@
-import mongoose, { Schema, Document } from "mongoose";
+import mongoose from 'mongoose'
 
-// Define the interface for WorkFlow
-export interface IWorkFlow extends Document {
-  user: mongoose.Types.ObjectId; // Required
-  company: mongoose.Types.ObjectId; // Required
-  identifier: string; // Required
-  workFlowName: string; // Required
-  values: Record<string, unknown>;
-  defaultActive: boolean;
-  created_At: Date;
-  updated_At: Date;
-  deletedAt: Date;
-  schema: mongoose.Schema<any>; // Required type correction
-}
-
-// Define the schema
-const workFlowSchema: Schema = new Schema({
-  user: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Accounts',
-    required: true, // Ensure it's a required field
-  },
-  company: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Organisation',
-    required: true, // Ensure it's a required field
-  },
-  identifier: {
-    type: String,
-    required: true, // Ensure it's a required field
-  },
-  workFlowName: {
-    type: String,
-    required: true, // Ensure it's a required field
-  },
-  values: {
-    type: mongoose.Schema.Types.Mixed,
-  },
-  defaultActive: {
-    type: Boolean,
-    default: false,
-  },
-  created_At: {
-    type: Date,
-    default: Date.now,
-  },
-  updated_At: {
-    type: Date,
-  },
-  deletedAt: {
-    type: Date,
-  },
-  schema: {
-    type: mongoose.Schema.Types.Mixed,
-    default: {},
-  },
-});
+const workFlowSchema = new mongoose.Schema({
+    user : {
+        type : mongoose.Schema.Types.ObjectId,
+        ref : 'Accounts'
+    },
+    company : {
+        type : mongoose.Schema.Types.ObjectId,
+        ref : 'Organisation'
+    },
+    identifier : {
+        type : String
+    },
+    workFlowName : {
+        type : String
+    },
+    values : {
+        type : mongoose.Schema.Types.Mixed
+    },
+    defaultActive : {
+        type : Boolean,
+        default : false
+    },
+    created_At: {
+        type: Date,
+        default: Date.now,
+    },
+    updated_At : {
+        type : Date
+    },
+    deletedAt: {
+        type: Date
+    },
+    schema : {
+        type : mongoose.Schema.Types.Mixed,
+        default : {}
+    }
+})
 
-// Handle model initialization
-let WorkFlowModel: mongoose.Model<IWorkFlow> | null = null;
+let WorkFlowModel: mongoose.Model<any> | null = null;
 
 if (mongoose.models.WorkFlow) {
   console.log("WorkFlow model already exists.");
   WorkFlowModel = mongoose.models.WorkFlow;
 } else {
   console.log("Creating WorkFlow model fallback.");
-  WorkFlowModel = mongoose.model<IWorkFlow>("WorkFlow", workFlowSchema);
+  WorkFlowModel = mongoose.model<any>("WorkFlow", workFlowSchema);
 }
 
-export default WorkFlowModel;
+export default WorkFlowModel;

package/src/repository/user.repository.ts

@@ -2,8 +2,8 @@ import Account from "./schemas/accounts.schema";
 import organisation from "./schemas/organisation.schema";
 import Tokens from "./schemas/tokens.schema";
 import mongoose, { Schema, Document, Types } from "mongoose";
-import User from "../routes/user.route";
-import { VERIFY_EMAIL } from "../utils/env";
+import User from "~/routes/user.route";
+import { VERIFY_EMAIL } from "~/utils/env";
 
 export const usersColumns = {
   id: "users.id",
@@ -37,7 +37,7 @@ type FindUserProps = {
 export type UserProfile = {
   _id?: string;
   name?: string;
-  email?: string;
+  email?: any;
   password?: string;
   avatarUrl?: string;
   is_active?: boolean;
@@ -69,7 +69,7 @@ export type UserProfile = {
  * @param {string} mobileNumber
  * @param  {FindUserProps} deleted_at=null}
  */
-export async function findUser({ id, email, moNumber }: FindUserProps) {
+export async function findUser({ id, email, moNumber }: FindUserProps) : Promise<any> {
   let search = {};
   // let search: any = { deletedAt: { $exists: false } };
   if (id) search = { _id: new mongoose.Types.ObjectId(id) };
@@ -86,21 +86,28 @@ export async function findUser({ id, email, moNumber }: FindUserProps) {
  */
 
 export async function createUser(
-  userData: UserProfile
-)  : Promise<any>{
+  userData: { name: string;
+    email: string;
+    role: string;
+    company: any;
+    permission: string[];
+    userType: string;
+    password: string;}
+): Promise<Schema.Types.ObjectId | Error> {
   try {
-    const user = await Account.register(
-      new Account({
-        name: userData.name,
-        username: userData.email,
-        role: userData.role,
-        company: userData.company,
-        permission: userData.permission,
-        userType : userData.userType,
-        is_active: VERIFY_EMAIL === "true" ? false : true,
-      }),
-      userData.password
-    );
+    const user = await Account.register(userData.email, userData.password);
+
+    // Manually set additional fields post-registration
+    user.name = userData.name;
+    user.role = userData.role;
+    user.company = userData.company.toString(); // Convert ObjectId to string
+    user.permission = userData.permission;
+    user.userType = userData.userType;
+    user.is_active = true; // Set based on logic
+
+    // Save changes to DB
+    await user.save();
+
     const userId = user._id.toString();
     return userId;
   } catch (error) {
@@ -114,7 +121,7 @@ export async function createUser(
  * @param  {string} id
  * @param  {UserProfile} data
  */
-export async function updateUser(id: string, data: UserProfile) : Promise<any> {
+export async function updateUser(id: string, data: UserProfile): Promise<any> {
   try {
     const user = await Account.updateOne({ _id: id }, { $set: data });
     return user;
@@ -123,35 +130,47 @@ export async function updateUser(id: string, data: UserProfile) : Promise<any> {
   }
 }
 
-export async function createWorkFlowUser(userData: any)  : Promise<any>{
+export async function createWorkFlowUser(userData: any) {
   try {
-    const checkUser = await Account.findOne({ username: userData.email });
+    console.log(userData);
+
+    // Check if the user already exists
+    const checkUser: any = await Account.findOne({ username: userData.email });
     if (checkUser) {
-      if(userData.isText === 1 && userData?.password?.length && userData?.password?.trim()){
-        checkUser.setPassword(userData?.password, async (err: any, user: any) => {
-          if (err) {}
-          await checkUser.save()
-        })
+      // Update the password if needed
+      if (userData.isText === 1 && userData?.password?.trim()) {
+        await new Promise((resolve, reject) => {
+          checkUser.setPassword(userData.password, (err: any) => {
+            if (err) return reject(err);
+            resolve(null);
+          });
+        });
+        await checkUser.save();
       }
       return {
         status: "success",
         data: checkUser?._id,
       };
     } else {
-      const user = await Account.register(
-        new Account({
-          username: userData.email,
-          role: userData.role,
-          moNumber: userData.moNumber,
-          designation: userData.designation,
-          level: userData.level,
-          company: userData.company,
-          permission: userData.permission,
-          is_active: userData.isActive,
-          defaultWorkflow:userData.defaultWorkflow
-        }),
-        userData.password
-      );
+      // Create a new instance of the Account model
+      const user = new Account({
+        username: userData.email,
+        role: userData.role,
+        moNumber: userData.moNumber,
+        designation: userData.designation,
+        level: userData.level,
+        company: userData.company,
+        permission: userData.permission,
+        is_active: userData.isActive,
+        defaultWorkflow: userData.defaultWorkflow,
+      });
+
+      // Register the user and set the password
+      await Account.register(user as any, userData.password);
+
+      // Save the user
+      await user.save();
+
       if (user) {
         return {
           status: "success",
@@ -164,14 +183,16 @@ export async function createWorkFlowUser(userData: any)  : Promise<any>{
         };
       }
     }
-  } catch (error) {
-    console.log(error?.message);
+  } catch (error: any) {
+    console.error(error);
     return {
       status: "error",
       data: error.message,
     };
   }
 }
+
+
 //update usertoken in mongodb in Tokens collection
 /**
  * @param  {string} id
@@ -180,7 +201,7 @@ export async function createWorkFlowUser(userData: any)  : Promise<any>{
 export async function getUserByIdAndJoinUserToken(
   id: string,
   type: "verify_email" | "forgot_password" | "team_invitation_email"
-)  : Promise<any>{
+) {
   try {
     const session = await Tokens.findOneAndUpdate(
       { user_id: new mongoose.Types.ObjectId(id) },
@@ -196,7 +217,7 @@ export async function getUserByIdAndJoinUserToken(
 /**
  * @param  {string} id
  */
-export async function activeUser(id: string)  : Promise<any>{
+export async function activeUser(id: string): Promise<any> {
   try {
     const user = await Account.findByIdAndUpdate(id, { is_active: true });
     return user;
@@ -205,7 +226,7 @@ export async function activeUser(id: string)  : Promise<any>{
   }
 }
 
-export async function getPermissions(id: string) : Promise<any> {
+export async function getPermissions(id: string) {
   try {
     const pipeline = [
       {
@@ -253,7 +274,7 @@ export async function getallusers(
   sort: string | null,
   skip: string | null,
   limit: string | null
-) : Promise<any> {
+) {
   try {
     let infiniteScroll: any = [];
     if (sort && skip && limit) {
@@ -319,7 +340,7 @@ export async function getalluser(
   company: string,
   user: string,
   role: string
-){
+) {
   try {
     let idSearch: object = { user: user };
     if (role === "admin") {
@@ -359,7 +380,7 @@ export async function getalluser(
   }
 }
 
-export async function deleteUserById(id: string) : Promise<any> {
+export async function deleteUserById(id: string): Promise<any> {
   try {
     const result = await Account.updateOne(
       { _id: id },
@@ -373,7 +394,7 @@ export async function deleteUserById(id: string) : Promise<any> {
   }
 }
 
-export async function getUser(id: string) : Promise<any> {
+export async function getUser(id: string) {
   const pipeline = [
     {
       $match: {
@@ -403,7 +424,7 @@ export async function getUser(id: string) : Promise<any> {
     });
 }
 
-export async function getUserAccountDetails(id: string)  : Promise<any>{
+export async function getUserAccountDetails(id: string) {
   try {
     const accountData = await Account.findById(id).populate("company");
     if (accountData) {
@@ -417,7 +438,7 @@ export async function getUserAccountDetails(id: string)  : Promise<any>{
   }
 }
 
-export async function updateUserAccountDetails(id: string, data: any)  : Promise<any>{
+export async function updateUserAccountDetails(id: string, data: any) {
   try {
     const accountData = await Account.findByIdAndUpdate(
       id,
@@ -435,7 +456,7 @@ export async function updateUserAccountDetails(id: string, data: any)  : Promise
   }
 }
 
-export async function getCompanyByUserId(id: string)  : Promise<any>{
+export async function getCompanyByUserId(id: string) {
   try {
     const account = await Account.findById(id);
     if (!account) {
@@ -447,7 +468,7 @@ export async function getCompanyByUserId(id: string)  : Promise<any>{
   }
 }
 
-export async function getUserByLevel(level: string)  : Promise<any>{
+export async function getUserByLevel(level: string) {
   try {
     const account = await Account.findOne({  level: level });
     if (account) {
@@ -470,7 +491,7 @@ export async function getUserByLevel(level: string)  : Promise<any>{
   }
 }
 
-export async function updateUserWorkFlowStatus(data: any) : Promise<any> {
+export async function updateUserWorkFlowStatus(data: any) {
   try {
     const modifiedData = await Account.findByIdAndUpdate(data.id, data, {
       new: true,

package/src/repository/user_tokens.repository.ts

@@ -1,4 +1,4 @@
-import Tokens from '../repository/schemas/tokens.schema'
+import Tokens from '~/repository/schemas/tokens.schema'
 import mongoose, { Schema, Document } from 'mongoose';
 
 //this defines the data strucutre of the Condition object
@@ -20,7 +20,7 @@ type GetToken = {
  */
 export async function createToken(userId: string, token: string, type: 'verify_email' | 'forgot_password' | 'signup_vendor') {
   try {
-    const tokens : any = await Tokens.collection.insertOne({ token, type, user_id: new mongoose.Types.ObjectId(userId), isActive: true })
+    const tokens = await Tokens.collection.insertOne({ token, type, user_id: new mongoose.Types.ObjectId(userId), isActive: true })
     return tokens
   } catch (err) {
     return err
@@ -52,7 +52,7 @@ export async function findToken(token: string){
   }catch(err){
     return err
   }
-}
+} 
 
 /**
  * change token status in mongodb in Tokens collection

package/src/repository/userrole.repository.ts

@@ -112,7 +112,7 @@ import mongoose from 'mongoose';
 import UserRole from '~/repository/schemas/userrole.schema'
 
 export { IUserRole }
-export async function createRolePermission(data: IUserRole) {
+export async function createRolePermission(data: IUserRole): Promise<mongoose.Types.ObjectId | Error> {
     try {
         // const result = await UserRole.deleteMany({});
         const rolePermission = new UserRole({
@@ -123,7 +123,7 @@ export async function createRolePermission(data: IUserRole) {
             createdAt: new Date()
         });
 
-        const savedData : any = await rolePermission.save()
+        const savedData = await rolePermission.save()
         savedData.template = savedData._id
         await savedData.save()
         console.log(rolePermission)

package/src/repository/workflow.repository.ts

@@ -1,5 +1,5 @@
-import { Schema } from "mongoose";
 import WorkFlow from "./schemas/workflow.schema";
+import { Schema } from "mongoose";
 
 export type WorkFlowData = {
   _id?: string;
@@ -13,7 +13,7 @@ export type WorkFlowData = {
 
 export async function createWorkFlow(
   workFlowData: WorkFlowData
-){
+): Promise<Schema.Types.ObjectId | Error> {
   try {
     const workflow = WorkFlow.create(new WorkFlow(workFlowData));
     if (!workflow) {
@@ -263,7 +263,6 @@ export async function getDefaultWorkFlow(data: any) {
 
 export async function getSingleWorkFlow(data: any) {
   try {
-    console.log(WorkFlow)
     let workflow = await WorkFlow.findOne(data);
     if (workflow) {
       workflow.values = Array.isArray(workflow.values)
@@ -309,7 +308,7 @@ export async function getDefaultWorkFlows(data: any) {
   }
 }
 
-export async function getWorkFlow(data: any) {
+export async function getWorkFlow(data: any): Promise<WorkFlowData> {
   try {
     const workflow = await WorkFlow.findOne(data);
     return workflow;
@@ -318,7 +317,7 @@ export async function getWorkFlow(data: any) {
   }
 }
 
-export async function getWorkFlowLevel(Id: any) {
+export async function getWorkFlowLevel(Id: any): Promise<WorkFlowData> {
   try {
     const workflow = await WorkFlow.findById(Id);
     return workflow;

package/src/routes/accountdetails.route.ts

@@ -1,6 +1,7 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
-import { authenticateJWT } from '../controllers/auth.controller';
-import { createAccountService, getAccountService } from '../services/statement/accountdetails.service';
+import { authenticateJWT } from '~/controllers/auth.controller';
+import { grantAccess } from '~/controllers/rbac/rbac.controller';
+import { createAccountService, getAccountService } from '~/services/statement/accountdetails.service';
 
 const AccountDetails = express.Router();
 

package/src/routes/auth.route.ts

@@ -2,6 +2,7 @@ import express from 'express';
 
 import auth from 'express-basic-auth'
 
+import { registerAdmin, loginUser, forgotPasswordUser, verifyEmail, resetPasswordUser } from '~/services/authentication';
 
 const basic = auth({
     users: { 'admin': 'abc12345' },
@@ -11,14 +12,14 @@ const basic = auth({
 
 const Auth = express.Router();
 
-// Auth.post('/signup', registerAdmin)
+Auth.post('/signup', registerAdmin)
 
-// Auth.post('/login', loginUser);
+Auth.post('/login', loginUser);
 
-// Auth.post('/forgotPassword', forgotPasswordUser)
+Auth.post('/forgotPassword', forgotPasswordUser)
 
-// Auth.get('/verifyEmail', verifyEmail);
+Auth.get('/verifyEmail', verifyEmail);
 
-// Auth.post('/resetPassword', resetPasswordUser)
+Auth.post('/resetPassword', resetPasswordUser)
 
 export default Auth

package/src/routes/document.route.ts

@@ -1,6 +1,6 @@
 import express from 'express';
-import { authenticateJWT } from '../controllers/auth.controller';
-import { createPendingApprovalService, deleteAllDocumentsService, deleteSingleDocumentService, findOneAndDeleteDocument, getAllDocumentService, getcountDocumentsByLevelAndStatusService, sendMailService, updateDocumentService, updateStatusService } from '../services/document/document.services';
+import { authenticateJWT } from '~/controllers/auth.controller';
+import { createPendingApprovalService, deleteAllDocumentsService, deleteSingleDocumentService, findOneAndDeleteDocument, getAllDocumentService, getcountDocumentsByLevelAndStatusService, saveAsDraftService, sendMailService, updateDocumentService, updateStatusService, uploadAddtionalDocumentsService } from '~/services/document/document.services';
 
 
 const Document = express.Router();
@@ -13,8 +13,12 @@ Document.post('/getcount', authenticateJWT, getcountDocumentsByLevelAndStatusSer
 
 Document.put('/updatedoc/:id', authenticateJWT,updateDocumentService)
 
+Document.put('/save/:id', authenticateJWT, saveAsDraftService)
+
 Document.post('/create',authenticateJWT,createPendingApprovalService)
 
+Document.post('/upload/addtionalDocument',authenticateJWT,uploadAddtionalDocumentsService)
+
 Document.delete('/single/:id',authenticateJWT,deleteSingleDocumentService)
 
 Document.delete('/deleteMany',authenticateJWT,deleteAllDocumentsService)

package/src/routes/fileSystem.route.ts

@@ -1,9 +1,11 @@
 import express from 'express'
-import { uploadFileService, getFileService, downloadFile } from '../services/fileSystem/fileSystem.service'
+import { uploadFileService, getFileService, downloadFile } from '~/services/fileSystem/fileSystem.service'
 
 
 const FileUpload = express()
 
+// route.post('/upload-file',uploadFileWithMulter)
+
 
 FileUpload.post('/upload', uploadFileService)
 

package/src/routes/form.route.ts

@@ -1,6 +1,11 @@
 import express from "express";
-import { createFormService, deleteFormService, getallFormService, updateFormService } from "../services/form/form.service";
-import { authenticateJWT } from "../controllers/auth.controller";
+import { authenticateJWT } from "~/controllers/auth.controller";
+import {
+  createFormService,
+  deleteFormService,
+  getallFormService,
+  updateFormService,
+} from "~/services/form/form.service";
 
 const Form = express.Router();
 

package/src/routes/index.ts

@@ -1,6 +1,7 @@
 import express, { Request, Response, NextFunction } from 'express';
-import {authenticateJWT} from '../controllers/auth.controller'
+
 //import Account from '../repository/schemas/accounts.schema'
+import { authenticateJWT } from '~/controllers/auth.controller';
 
 const routes = express.Router();
 

package/src/routes/log.route.ts

@@ -1,15 +1,15 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
 
-import { authenticateJWT } from "../controllers/auth.controller";
+import { authenticateJWT } from '~/controllers/auth.controller';
 
-import { grantAccess } from '../controllers/rbac/rbac.controller'
-import { createLogService, getLogService } from '../services/logs/log.service';
+import { grantAccess } from '~/controllers/rbac/rbac.controller'
+import { createLogService, getLogService } from '~/services/logs/log.service';
 
 
 const Logs = express.Router();
 
 Logs.post('/create', authenticateJWT, createLogService)
 
-// Logs.get('/get', authenticateJWT, getLogService)
+Logs.get('/get', authenticateJWT, getLogService)
 
 export default Logs;

package/src/routes/notifications.route.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 import { authenticateJWT } from '~/controllers/auth.controller';
-import { createNotificationsService, deleteNotificationsService, getAllNotificationsService, getReadNotificationsService, getUnreadNotificationsCountService, getUnreadNotificationsService, markAllNotificationsAsReadService, updateNotificationsService } from '../services/notifications/notifications.service';
+import { createNotificationsService, getUnreadNotificationsCountService,getUnreadNotificationsService,getReadNotificationsService, updateNotificationsService, deleteNotificationsService, markAllNotificationsAsReadService, getAllNotificationsService } from '~/services/notifications/notifications.service';
 
 const Notifications = express.Router();
 

package/src/routes/org.route.ts

@@ -1,6 +1,6 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
-import { authenticateJWT } from "../controllers/auth.controller";
-import { createOrganizationService, getComplainceCountService, getOrgDetailsService, getOrganisationService, updateOrganisationHandler } from '../services/organisation/organisation.service';
+import { authenticateJWT } from '~/controllers/auth.controller';
+import { createOrganizationService, getComplainceCountService, getOrgDetailsService, getOrganisationService, updateOrganisationHandler } from '~/services/organisation/organisation.service';
 
 
 const Organisation = express.Router();

package/src/routes/profile.route.ts

@@ -1,9 +1,10 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
+import { createProfileService, getAllProfileService, updateProfileService } from '~/services/profile/profile.services'
 
 const Profile = express.Router();
 
-// Profile.get('/get', getAllProfileService)
-// Profile.post('/create', createProfileService)
-// Profile.put('/update/:id', updateProfileService)
+Profile.get('/get', getAllProfileService)
+Profile.post('/create', createProfileService)
+Profile.put('/update/:id', updateProfileService)
 
 export default Profile;

package/src/routes/role.route.ts

@@ -1,14 +1,17 @@
 import express, { Request, Response, NextFunction, Router } from 'express';
 
+import { authenticateJWT } from '~/controllers/auth.controller';
+import { grantAccess } from '~/controllers/rbac/rbac.controller'
 
 
+import { createRoleService, getAllRolesService, getRoleById, deleteRoleService, updateRoleService } from '~/services/roles/role.services';
 
 const Roles = express.Router();
 
-// Roles.post('/create', authenticateJWT, grantAccess('create', 'roles'), createRoleService)  // grantAccess('create', 'roles'),
-// Roles.get('/get', authenticateJWT, grantAccess('get', 'roles'), getAllRolesService)  // grantAccess('get', 'roles')
+Roles.post('/create', authenticateJWT, grantAccess('create', 'roles'), createRoleService)  // grantAccess('create', 'roles'),
+Roles.get('/get', authenticateJWT, grantAccess('get', 'roles'), getAllRolesService)  // grantAccess('get', 'roles')
 // Roles.get('/get/:id', authenticateJWT, grantAccess('get', 'roles'), getRoleById)
-// Roles.delete('/delete/:id', grantAccess('delete', 'roles'), authenticateJWT, deleteRoleService)
-// Roles.put('/update/:id', authenticateJWT, grantAccess('update', 'roles'), updateRoleService)
+Roles.delete('/delete/:id', grantAccess('delete', 'roles'), authenticateJWT, deleteRoleService)
+Roles.put('/update/:id', authenticateJWT, grantAccess('update', 'roles'), updateRoleService)
 
 export default Roles;