@platform-modules/foreign-ministry 1.0.76 → 1.0.78

package/dist/models/{FinancialSettingsModel.js → userRolesModel.js}

@@ -1,4 +1,14 @@
 "use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -9,36 +19,36 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FinancialSettings = void 0;
+exports.UserRole = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-let FinancialSettings = class FinancialSettings extends BaseModel_1.BaseModel {
-    constructor(service_id, approval_level, approver_role_id) {
+let UserRole = class UserRole extends BaseModel_1.BaseModel {
+    constructor(role_id, user_id, department_id, section_id) {
         super();
-        this.service_id = service_id;
-        this.approval_level = approval_level;
-        this.approver_role_id = approver_role_id;
-        this.is_active = true;
+        this.role_id = role_id;
+        this.user_id = user_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
     }
 };
-exports.FinancialSettings = FinancialSettings;
+exports.UserRole = UserRole;
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
     __metadata("design:type", Number)
-], FinancialSettings.prototype, "service_id", void 0);
+], UserRole.prototype, "role_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
     __metadata("design:type", Number)
-], FinancialSettings.prototype, "approval_level", void 0);
+], UserRole.prototype, "user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
     __metadata("design:type", Number)
-], FinancialSettings.prototype, "approver_role_id", void 0);
+], UserRole.prototype, "department_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
-    __metadata("design:type", Boolean)
-], FinancialSettings.prototype, "is_active", void 0);
-exports.FinancialSettings = FinancialSettings = __decorate([
-    (0, typeorm_1.Entity)({ name: 'financial_settings' }),
-    __metadata("design:paramtypes", [Number, Number, Number])
-], FinancialSettings);
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "section_id", void 0);
+exports.UserRole = UserRole = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_role' }),
+    __metadata("design:paramtypes", [Number, Number, Number, Number])
+], UserRole);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -50,6 +50,11 @@ import { MessageReadStatus } from './models/MessageReadStatusModel';
 import { ShiftDetails } from './models/ShifttimesModel';
 import { AttendanceDetails } from './models/AttendanceModel';
 import { UserShift } from './models/UserShiftModel';
+import { Holidays } from './models/HolidaysModel';
+import { UserRole } from './models/userRolesModel';
+import { RoleRights } from './models/roleRightsModel';
+import { PortalFeedback } from './models/PortalFeedbackModel';
+import { Notification } from './models/NotificationModel';
 
 
 export const AppDataSource = new DataSource({
@@ -59,7 +64,7 @@ export const AppDataSource = new DataSource({
   username: process.env.DB_USER || 'postgres',
   password: process.env.DB_PASS || 'postgres',
   database: process.env.DB_NAME || 'common_models',
-  synchronize: false, // auto-create tables (disable in prod)
+  synchronize: true, // auto-create tables (disable in prod)
   logging: false,
   entities: [
     User,
@@ -105,6 +110,11 @@ export const AppDataSource = new DataSource({
     MessageReadStatus,
     ShiftDetails,
     AttendanceDetails,
-    UserShift
+    UserShift,
+    Holidays,
+    UserRole,
+    RoleRights,
+    PortalFeedback,
+    Notification
   ],
 });

package/src/index.ts

@@ -42,16 +42,8 @@ export * from './models/ShifttimesModel';
 export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
 export * from './models/UserShiftModel';
-export * from './models/FinancialRequestsModel';
-export * from './models/PayslipRequestsModel';
-export * from './models/SalaryCertificateRequestsModel';
-export * from './models/AllowanceRequestsModel';
-export * from './models/ReimbursementRequestsModel';
-export * from './models/BankAccountChangeRequestsModel';
-export * from './models/FinancialChatsModel';
-export * from './models/FinancialApprovalsModel';
-export * from './models/FinancialWorkFlowModel';
-export * from './models/FinancialAttachmentsModel';
-export * from './models/RequestTypeMasterModel';
-export * from './models/FinancialSettingsModel';
-export * from './models/AllowanceTypesModel';
+export * from './models/HolidaysModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';
+export * from './models/PortalFeedbackModel';
+export * from './models/NotificationModel';

package/src/models/FMServices.ts

@@ -14,7 +14,7 @@ export class FMServices extends BaseModel {
     @Column({ nullable: false })
     description: string;
 
-    @Column({ nullable: false })
+    @Column({ nullable: true })
     logo_url: string;
 
     constructor(     

package/src/models/HolidaysModel.ts

@@ -0,0 +1,46 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'holidays' })
+export class Holidays extends BaseModel {
+
+  @Column({ type: 'varchar', length: 200 })
+  title: string;
+
+  @Column({ type: 'date', name: 'holiday_date' })
+  holiday_date: Date;
+
+  @Column({ type: 'text', nullable: true })
+  description?: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  region?: string;
+
+  @Column({ type: 'boolean', name: 'is_optional', default: false })
+  is_optional: boolean;
+
+  @Column({ type: 'varchar', length: 30, name: 'holiday_type', default: 'Public' })
+  holiday_type: string;
+
+  @Column({ type: 'int', nullable: true })
+  year?: number;
+
+  constructor(
+    title: string,
+    holiday_date: Date,
+    description?: string,
+    region?: string,
+    is_optional: boolean = false,
+    holiday_type: string = 'Public',
+    year?: number
+  ) {
+    super();
+    this.title = title;
+    this.holiday_date = holiday_date;
+    this.description = description;
+    this.region = region;
+    this.is_optional = is_optional;
+    this.holiday_type = holiday_type;
+    this.year = year;
+  }
+}

package/src/models/NotificationModel.ts

@@ -0,0 +1,68 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum NotificationType {
+    REQUEST_RAISED = 'request raised',
+    REMINDER = 'reminder',
+    IMPORT = 'import',
+}
+
+@Entity({ name: 'notification' })
+export class Notification extends BaseModel {
+
+    @Column({
+        type: "enum",
+        enum: NotificationType,
+        nullable: false,
+    })
+    type: NotificationType;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    role_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'jsonb', nullable: true })
+    content: any;
+
+    @Column({ type: 'boolean', default: false })
+    is_read: boolean;
+
+    @Column({ type: 'bigint', nullable: true })
+    request_id: number;
+
+    @Column({ type: 'varchar', length: 500, nullable: true })
+    route_path: string;
+
+    constructor(
+        type: NotificationType,
+        user_id: number,
+        role_id: number,
+        department_id: number,
+        section_id: number,
+        content: any,
+        is_read: boolean,
+        request_id: number,
+        route_path: string
+    ) {
+        super();
+        this.type = type;
+        this.user_id = user_id;
+        this.role_id = role_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.content = content;
+        this.is_read = is_read;
+        this.request_id = request_id;
+        this.route_path = route_path;
+    }
+}
+

package/src/models/PortalFeedbackModel.ts

@@ -0,0 +1,33 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { Rating } from './feedbackModel';
+
+@Entity({ name: 'portal_feedback' })
+export class PortalFeedback extends BaseModel {
+
+    @Column({ nullable: true })
+    comment: string;
+
+    @Column({
+        type: "enum",
+        enum: Rating,
+        nullable: true,
+    })
+    rating: Rating;
+
+    @Column({ nullable: true })
+    user_Id: number;
+
+    constructor(
+        comment: string,
+        rating: Rating,
+        user_Id: number,
+    ) {
+        super();
+        this.comment = comment,
+        this.rating = rating,
+        this.user_Id = user_Id
+    }
+}
+

package/src/models/role.ts

@@ -12,12 +12,6 @@ Userrole Information will store
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export interface Irole {
-    name: string;   
-    id?: number;
-    is_deleted?: boolean;
-    created_by?: number;
-}
 @Entity({ name: 'role' })
 export class Role extends BaseModel {
 
@@ -28,7 +22,7 @@ export class Role extends BaseModel {
     is_deleted?: boolean;  
 
 
-    constructor(name: string,is_deleted:boolean,userId: number) {
+    constructor(name: string, is_deleted:boolean) {
         super();
         this.name = name
         this.is_deleted = is_deleted

package/src/models/roleRightsModel.ts

@@ -0,0 +1,31 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'role_rights' })
+export class RoleRights extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: true })
+    user_role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    service_id: number;
+
+
+    constructor(user_role_id: number, service_id: number) {
+        super();
+        this.user_role_id = user_role_id
+        this.service_id = service_id
+    }
+}

package/src/models/user.ts

@@ -106,6 +106,19 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     qualification?: string;
 
+    
+    @Column({ nullable: true })
+    father_name?: string;
+
+    @Column({ nullable: true })
+    spouse_name?: string;
+    
+    @Column({ nullable: true })
+    children1_name?: string;
+ 
+    @Column({ nullable: true })
+    children2_name?: string;
+
     constructor(     
         employee_id?: number,
         employee_name?: string,
@@ -141,6 +154,10 @@ export class User extends BaseModel {
         diplomatic_name?: string,
         civil_employee_id?: number,
         qualification?: string,
+        father_name?: string,
+        spouse_name?: string,
+        children1_name?: string,
+        children2_name?: string,
     ) {
         super();     
         this.employee_id = employee_id;
@@ -177,5 +194,9 @@ export class User extends BaseModel {
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
     }
 }

package/src/models/userRolesModel.ts

@@ -0,0 +1,38 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'user_role' })
+export class UserRole extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: false })
+    role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number;
+
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number) {
+        super();
+        this.role_id = role_id
+        this.user_id = user_id
+        this.department_id = department_id
+        this.section_id = section_id
+    }
+}

package/FINANCIAL_MODELS_SUMMARY.md

@@ -1,144 +0,0 @@
-# ✅ Financial Service Models - COMPLETED
-
-## 🎉 Successfully Created 13 Models
-
-### ✨ Updates Made:
-- ❌ **Removed:** `ReimbursementCategoriesModel.ts` - Not needed (users enter type directly)
-- ✅ **Updated:** `ReimbursementRequestsModel.ts` - Changed to use free text `reimbursement_type` field
-- ✅ **Fixed:** Renamed all enums to avoid conflicts with Leave module
-
----
-
-## 📦 Final Model List
-
-### Core Request Tables (6):
-1. ✅ **FinancialRequestsModel.ts** - Main parent table
-2. ✅ **PayslipRequestsModel.ts** (FM001)
-3. ✅ **SalaryCertificateRequestsModel.ts** (FM002)
-4. ✅ **AllowanceRequestsModel.ts** (FM003)
-5. ✅ **ReimbursementRequestsModel.ts** (FM004) - Uses free text, no category table
-6. ✅ **BankAccountChangeRequestsModel.ts** (FM005)
-
-### Supporting Tables (4):
-7. ✅ **FinancialChatsModel.ts**
-8. ✅ **FinancialApprovalsModel.ts**
-9. ✅ **FinancialWorkFlowModel.ts**
-10. ✅ **FinancialAttachmentsModel.ts**
-
-### Configuration Tables (3):
-11. ✅ **RequestTypeMasterModel.ts**
-12. ✅ **FinancialSettingsModel.ts**
-13. ✅ **AllowanceTypesModel.ts**
-
----
-
-## 🔑 Simplified Structure
-
-- **Primary Key:** `id` (auto-increment integer)
-- **No `request_number` field** - Just use the `id` directly
-- **No `request_code` field** - Can be added in future if needed
-
----
-
-## 🔧 Enum Names (Renamed to Avoid Conflicts)
-
-| Original Name | New Name | Values |
-|---------------|----------|---------|
-| RequestStatus | **FinancialRequestStatus** | Draft, Submitted, Pending, In Progress, Approved, Rejected, Completed, Cancelled |
-| ApprovalStatus | **FinancialApprovalStatus** | Pending, Approved, Rejected, Skipped |
-| WorkFlowStatus | **FinancialWorkFlowStatus** | Completed, Not Yet Started, Pending, In Progress |
-
----
-
-## 📋 ReimbursementRequestsModel Structure
-
-```typescript
-@Entity({ name: 'reimbursement_requests' })
-export class ReimbursementRequests {
-  financial_request_id: number;
-  reimbursement_type: string;        // ✅ Free text field (user enters: Medical, Travel, etc.)
-  claimed_amount: number;
-  expense_date: Date;
-  expense_description: string;       // ✅ Detailed description
-  vendor_name: string;
-  invoice_number: string;
-  approved_amount: number;
-  rejection_reason: string;
-  verified_by_user_id: number;
-  verification_date: Date;
-  payment_processed: boolean;
-  payment_reference_number: string;
-  payment_date: Date;
-}
-```
-
----
-
-## ✅ Validation Passed
-
-- ✅ No linter errors
-- ✅ All models exported in `index.ts`
-- ✅ No enum conflicts
-- ✅ Proper TypeScript types
-- ✅ All constructors defined
-
----
-
-## 🚀 Ready for Next Steps
-
-1. **Compile shared_models:**
-   ```bash
-   cd FM_Backend/shared_models
-   npm run build
-   ```
-
-2. **Update Data Source** - Add entities to TypeORM config
-
-3. **Create Repositories** - Implement CRUD operations
-
-4. **Create Services** - Business logic layer
-
-5. **Add API Routes** - REST endpoints
-
-6. **Seed Master Data:**
-   - Request types (FM001-FM005)
-   - Financial settings (approval matrix)
-   - Allowance types
-
----
-
-## 📊 Database Tables
-
-Total: **13 tables**
-
-```
-financial_requests                  ← Main table
-├── payslip_requests               ← One-to-One
-├── salary_certificate_requests    ← One-to-One
-├── allowance_requests             ← One-to-One
-├── reimbursement_requests         ← One-to-One (no category FK)
-├── bank_account_change_requests   ← One-to-One
-├── financial_chats                ← One-to-Many
-├── financial_approvals            ← One-to-Many
-├── financial_work_flows           ← One-to-Many
-└── financial_attachments          ← One-to-Many
-
-request_type_master                ← Master data
-financial_settings                 ← Configuration
-allowance_types                    ← Master data
-```
-
----
-
-## 🎯 Key Changes from Original Design
-
-1. **Removed `reimbursement_categories` table** - Simplified to free text entry
-2. **Renamed all enums** - Added "Financial" prefix to avoid conflicts
-3. **Updated ReimbursementRequests** - Removed FK to categories, added free text field
-
----
-
-✅ **ALL MODELS READY FOR USE!**
-
-Date: January 2025
-