my-typescript-library-rahul52us 1.2.4 → 1.2.6

package/src/repository/user.repository.ts

@@ -87,7 +87,7 @@ export async function findUser({ id, email, moNumber }: FindUserProps) {
 
 export async function createUser(
   userData: UserProfile
-) {
+)  : Promise<any>{
   try {
     const user = await Account.register(
       new Account({
@@ -114,7 +114,7 @@ export async function createUser(
  * @param  {string} id
  * @param  {UserProfile} data
  */
-export async function updateUser(id: string, data: UserProfile) {
+export async function updateUser(id: string, data: UserProfile) : Promise<any> {
   try {
     const user = await Account.updateOne({ _id: id }, { $set: data });
     return user;
@@ -123,7 +123,7 @@ export async function updateUser(id: string, data: UserProfile) {
   }
 }
 
-export async function createWorkFlowUser(userData: any) {
+export async function createWorkFlowUser(userData: any)  : Promise<any>{
   try {
     const checkUser = await Account.findOne({ username: userData.email });
     if (checkUser) {
@@ -180,7 +180,7 @@ export async function createWorkFlowUser(userData: 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 +196,7 @@ export async function getUserByIdAndJoinUserToken(
 /**
  * @param  {string} id
  */
-export async function activeUser(id: string) {
+export async function activeUser(id: string)  : Promise<any>{
   try {
     const user = await Account.findByIdAndUpdate(id, { is_active: true });
     return user;
@@ -205,7 +205,7 @@ export async function activeUser(id: string) {
   }
 }
 
-export async function getPermissions(id: string) {
+export async function getPermissions(id: string) : Promise<any> {
   try {
     const pipeline = [
       {
@@ -253,7 +253,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 +319,7 @@ export async function getalluser(
   company: string,
   user: string,
   role: string
-) {
+)  : Promise<any>{
   try {
     let idSearch: object = { user: user };
     if (role === "admin") {
@@ -359,7 +359,7 @@ export async function getalluser(
   }
 }
 
-export async function deleteUserById(id: string) {
+export async function deleteUserById(id: string) : Promise<any> {
   try {
     const result = await Account.updateOne(
       { _id: id },
@@ -373,7 +373,7 @@ export async function deleteUserById(id: string) {
   }
 }
 
-export async function getUser(id: string) {
+export async function getUser(id: string) : Promise<any> {
   const pipeline = [
     {
       $match: {
@@ -403,7 +403,7 @@ export async function getUser(id: string) {
     });
 }
 
-export async function getUserAccountDetails(id: string) {
+export async function getUserAccountDetails(id: string)  : Promise<any>{
   try {
     const accountData = await Account.findById(id).populate("company");
     if (accountData) {
@@ -417,7 +417,7 @@ export async function getUserAccountDetails(id: string) {
   }
 }
 
-export async function updateUserAccountDetails(id: string, data: any) {
+export async function updateUserAccountDetails(id: string, data: any)  : Promise<any>{
   try {
     const accountData = await Account.findByIdAndUpdate(
       id,
@@ -435,7 +435,7 @@ export async function updateUserAccountDetails(id: string, data: any) {
   }
 }
 
-export async function getCompanyByUserId(id: string) {
+export async function getCompanyByUserId(id: string)  : Promise<any>{
   try {
     const account = await Account.findById(id);
     if (!account) {
@@ -447,7 +447,7 @@ export async function getCompanyByUserId(id: string) {
   }
 }
 
-export async function getUserByLevel(level: string) {
+export async function getUserByLevel(level: string)  : Promise<any>{
   try {
     const account = await Account.findOne({  level: level });
     if (account) {
@@ -470,7 +470,7 @@ export async function getUserByLevel(level: string) {
   }
 }
 
-export async function updateUserWorkFlowStatus(data: any) {
+export async function updateUserWorkFlowStatus(data: any) : Promise<any> {
   try {
     const modifiedData = await Account.findByIdAndUpdate(data.id, data, {
       new: true,

package/src/repository/workflow.repository.ts

@@ -1,7 +1,6 @@
 import { Schema } from "mongoose";
-import { getWorkflowModel } from "../setupModal";
+import WorkFlow from "./schemas/workflow.schema";
 
-const WorkFlow = getWorkflowModel()
 export type WorkFlowData = {
   _id?: string;
   username: string;

package/src/routes/workflow.route.ts

@@ -1,27 +1,29 @@
 import express from "express";
 import { authenticateJWT } from "../controllers/auth.controller";
 import {
+  createWorkflowSettingService,
   getWorkflowSettingsService,
 } from "../services/workflow/workSettings.service";
+import { createWorkFlowService, deleteWorkflow, getallUsersWorkFlowService, getallWorkFlowService, getDefaultWorkFlowService, updateWorkFlowService, updateWorkFlowUserStatus } from "../services/workflow/workflow.service";
 
 
 const WorkFlow = express.Router();
 
-// WorkFlow.get("/get", authenticateJWT, getallWorkFlowService);
+WorkFlow.get("/get", authenticateJWT, getallWorkFlowService);
 
-// WorkFlow.post("/create", authenticateJWT, createWorkFlowService);
+WorkFlow.post("/create", authenticateJWT, createWorkFlowService);
 
-// WorkFlow.put("/update/:id", authenticateJWT, updateWorkFlowService);
+WorkFlow.put("/update/:id", authenticateJWT, updateWorkFlowService);
 
-// WorkFlow.delete("/delete/:id", authenticateJWT, deleteWorkflow);
+WorkFlow.delete("/delete/:id", authenticateJWT, deleteWorkflow);
 
-// WorkFlow.get("/get/default", authenticateJWT, getDefaultWorkFlowService);
+WorkFlow.get("/get/default", authenticateJWT, getDefaultWorkFlowService);
 
-// WorkFlow.put("/status/:id", authenticateJWT, updateWorkFlowUserStatus);
+WorkFlow.put("/status/:id", authenticateJWT, updateWorkFlowUserStatus);
 
-// WorkFlow.get("/get/users", authenticateJWT, getallUsersWorkFlowService);
+WorkFlow.get("/get/users", authenticateJWT, getallUsersWorkFlowService);
 
-// WorkFlow.post("/setting/create", authenticateJWT, createWorkflowSettingService);
+WorkFlow.post("/setting/create", authenticateJWT, createWorkflowSettingService);
 
 WorkFlow.get("/setting/get", authenticateJWT, getWorkflowSettingsService);
 

package/src/services/document/document.services.ts

@@ -45,7 +45,7 @@ interface UserRequest extends Request {
   };
 }
 
-export async function getCountService(req: UserRequest, res: Response) {
+export async function getCountService(req: UserRequest, res: Response): Promise<any> {
   try {
     let { level, _id } = req.user;
     let exchangeType = (req.query.exchangeType as string) || null;
@@ -57,7 +57,7 @@ export async function getCountService(req: UserRequest, res: Response) {
   }
 }
 
-export async function findOneAndDeleteDocument(req : any, res : any) {
+export async function findOneAndDeleteDocument(req : any, res : any): Promise<any> {
   try
   {
     await findOneByDocumentIdAndDelete({
@@ -76,7 +76,7 @@ export async function findOneAndDeleteDocument(req : any, res : any) {
   }
 }
 
-export async function createPendingApprovalFunction(req: any) {
+export async function createPendingApprovalFunction(req: any) : Promise<any> {
   try {
     if (req.body.documentId) {
       await findOneByDocumentIdAndDelete({
@@ -93,7 +93,7 @@ export async function createPendingApprovalFunction(req: any) {
       req.body.activeWorkflow || req.user.defaultWorkflow
     );
 
-    if (true) {
+    if (status === "success") {
       if (type === "word") {
         values = {
           user: userID,
@@ -145,12 +145,12 @@ export async function createPendingApprovalFunction(req: any) {
           helpInfo: req.body.helpInfo || {},
         };
         if (file) {
-          // const uploadedFile: any = await uploadFile(
-          //   file.file,
-          //   file.name,
-          //   file.type
-          // );
-          values = { ...values, file: '67319823bbf5d3230ca58bdd' };
+          const uploadedFile: any = await uploadFile(
+            file.file,
+            file.name,
+            file.type
+          );
+          values = { ...values, file: uploadedFile.fileId };
         }
       } else {
         const uploadedFile: any = await uploadFile(
@@ -476,7 +476,7 @@ export async function createPendingApprovalFunction(req: any) {
 export async function createPendingApprovalService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any> {
   try {
     const { status, data, statusCode, message } =
       await createPendingApprovalFunction({ user: req?.user, body: req?.body });
@@ -498,7 +498,7 @@ export async function createPendingApprovalService(
 export async function getAllPendingApprovalService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     let { company, _id } = req.user;
     let value = (req.query.value as string) || "";
@@ -523,7 +523,7 @@ export async function getAllPendingApprovalService(
   }
 }
 
-export async function getAllDocumentFunction(req: any) {
+export async function getAllDocumentFunction(req: any) : Promise<any> {
   try {
     // let { company, _id, level, defaultWorkflow } = req.user;
     let { defaultWorkflow } = req.user;
@@ -598,7 +598,7 @@ export async function getAllDocumentFunction(req: any) {
   }
 }
 
-export async function getAllDocumentService(req: UserRequest, res: Response) {
+export async function getAllDocumentService(req: UserRequest, res: Response) : Promise<any> {
   try {
     const { status, statusCode, documents } = await getAllDocumentFunction({
       body: req?.body,
@@ -645,7 +645,7 @@ export async function getCountByLevelAndStatusFunction(req: any) {
 export async function getcountDocumentsByLevelAndStatusService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any> {
   try {
     const { status, statusCode, data } = await getCountByLevelAndStatusFunction(
       { body: req?.body, user: req?.user }
@@ -658,7 +658,7 @@ export async function getcountDocumentsByLevelAndStatusService(
 export async function getPendingApprovalService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     let { company, _id } = req.user;
     let value = (req.query.value as string) || "";
@@ -997,7 +997,7 @@ export async function updateDocumentFunction(req: any, docId: any) {
   }
 }
 
-export async function updateDocumentService(req: UserRequest, res: Response) {
+export async function updateDocumentService(req: UserRequest, res: Response) : Promise<any> {
   try {
     const id = req?.params?.id;
     const { status, statusCode, message } = await updateDocumentFunction(
@@ -1017,7 +1017,7 @@ export async function updateDocumentService(req: UserRequest, res: Response) {
 export async function updateDocumentLevel2Service(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     const id = req.params.id;
     const updates = req.body;
@@ -1074,7 +1074,7 @@ export async function updateDocumentLevel2Service(
 export async function updateDocumentLevelService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     const id = req.params.id;
     const updates = req.body;
@@ -1134,7 +1134,7 @@ export async function updateDocumentLevelService(
   }
 }
 
-export const getDashChartService = async (req: UserRequest, res: Response) => {
+export const getDashChartService = async (req: UserRequest, res: Response) : Promise<any> => {
   try {
     req.body.user = req.user;
     const result = await getDashChartdata(req.body);
@@ -1147,7 +1147,7 @@ export const getDashChartService = async (req: UserRequest, res: Response) => {
   }
 };
 
-export const deleteAllDocumentsService = async (req: any, res: Response) => {
+export const deleteAllDocumentsService = async (req: any, res: Response) : Promise<any> => {
   try {
     const { status, data } = await deleteAllDocuments();
     if (status === "success") {
@@ -1169,7 +1169,7 @@ export const deleteAllDocumentsService = async (req: any, res: Response) => {
   }
 };
 
-export const deleteSingleDocumentService = async (req: any, res: Response) => {
+export const deleteSingleDocumentService = async (req: any, res: Response) : Promise<any> => {
   try {
     const { status, data } = await deleteSingleDocument({
       id: new mongoose.Types.ObjectId(req.params.id),

package/src/services/workflow/workSettings.service.ts

@@ -41,7 +41,7 @@ export async function createWorkflowSettingFunction(req: any) {
   }
 }
 
-export async function createWorkflowSettingService(req: any, res: Response) {
+export async function createWorkflowSettingService(req: any, res: Response):Promise<any> {
   try {
     const { status, statusCode, data } = await createWorkflowSettingFunction({
       body: req?.body,

package/src/services/workflow/workflow.service.ts

@@ -182,7 +182,7 @@ export async function generateWorkflow(req: any) {
 export async function createWorkFlowService(
   req: UserRequest,
   res: Response
-): Promise<Response> {
+): Promise<any> {
   try {
     const { status, statusCode, message } = await generateWorkflow({
       body: req.body,
@@ -272,7 +272,7 @@ export async function getDefaultWorkflowFunction(req: any) {
 export async function getDefaultWorkFlowService(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     const { status, statusCode, data } = await getDefaultWorkflowFunction({
       query: req?.query,
@@ -503,7 +503,7 @@ export async function updateWorkflowFunction(req: any, workflowId: any) {
 export async function updateWorkFlowService(
   req: UserRequest,
   res: Response
-): Promise<Response> {
+): Promise<any> {
   try {
     const { id } = req.params;
     const { status, statusCode, message } = await updateWorkflowFunction(
@@ -549,7 +549,7 @@ export async function getWorkflowFunctionService(req: any) {
 export async function getallWorkFlowService(
   req: UserRequest,
   res: Response
-): Promise<Response> {
+): Promise<any> {
   try {
     const { status, statusCode, data } = await getWorkflowFunctionService({
       query: req?.query,
@@ -586,7 +586,7 @@ export async function getUserWorkflowFunction(req: any) {
 export async function getallUsersWorkFlowService(
   req: UserRequest,
   res: Response
-): Promise<Response> {
+): Promise<any> {
   try {
     const { status, statusCode, workflow } = await getUserWorkflowFunction({
       user: req?.user,
@@ -632,7 +632,7 @@ export async function deleteWorkflowFunction(id: any) {
 export async function deleteWorkflow(
   req: Request,
   res: Response
-): Promise<Response> {
+): Promise<any> {
   const { id } = req.params;
   try {
     const { status, statusCode, message } = await deleteWorkflowFunction(id);
@@ -715,7 +715,7 @@ export async function updateWorkflowStatusFunction(id: any, req: any) {
 export async function updateWorkFlowUserStatus(
   req: UserRequest,
   res: Response
-) {
+) : Promise<any>{
   try {
     const id = req?.params?.id;
     const { status, statusCode, message } = await updateWorkflowStatusFunction(

package/src/setupModal.ts

@@ -1,7 +1,7 @@
 // library/mongooseSetup.ts
 import mongoose from "mongoose";
 import { DocumentSchema } from "./repository/schemas/document.schema";
-import { workFlowSchema } from "./repository/schemas/workflow.schema";
+import workFlowSchema from "./repository/schemas/workflow.schema";
 import { fileSystemSchema } from './repository/schemas/fileSystem.schema';
 
 /**
@@ -36,7 +36,7 @@ export const setupLibrary = (connection: typeof mongoose) => {
 
   // Dynamically resolve models and store them
   DocumentModel = getOrCreateModel("Document", DocumentSchema);
-  WorkflowModel = getOrCreateModel("Workflow", workFlowSchema);
+  // WorkflowModel = getOrCreateModel("Workflow", workFlowSchema);
   FileSystemModel = getOrCreateModel("FileSystem", fileSystemSchema);
 
   modelsInitialized = true;
@@ -58,10 +58,10 @@ export const getDocumentModel = () => {
   return DocumentModel;
 };
 
-export const getWorkflowModel = () => {
-  checkInitialization();
-  return WorkflowModel;
-};
+// export const getWorkflowModel = () => {
+//   checkInitialization();
+//   return WorkflowModel;
+// };
 
 export const getFileSystemModel = () => {
   checkInitialization();