@platform-modules/foreign-ministry 1.0.64 → 1.0.65

package/dist/data-source.js

@@ -42,10 +42,9 @@ const HelpContentModel_1 = require("./models/HelpContentModel");
 const HelpContentCategoryModel_1 = require("./models/HelpContentCategoryModel");
 const HelpContentAttachmentModel_1 = require("./models/HelpContentAttachmentModel");
 const contactInfoModel_1 = require("./models/contactInfoModel");
-const ConversationsV2Model_1 = require("./models/ConversationsV2Model");
-const ConversationParticipantsV2Model_1 = require("./models/ConversationParticipantsV2Model");
-const MessagesV2Model_1 = require("./models/MessagesV2Model");
-const MessageReadStatusModel_1 = require("./models/MessageReadStatusModel");
+const ShifttimesModel_1 = require("./models/ShifttimesModel");
+const AttendanceModel_1 = require("./models/AttendanceModel");
+const UserShiftModel_1 = require("./models/UserShiftModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -93,9 +92,8 @@ exports.AppDataSource = new typeorm_1.DataSource({
         HelpContentCategoryModel_1.HelpContentCategories,
         HelpContentAttachmentModel_1.HelpContentAttachments,
         contactInfoModel_1.ContactInfo,
-        ConversationsV2Model_1.ConversationsV2,
-        ConversationParticipantsV2Model_1.ConversationParticipantsV2,
-        MessagesV2Model_1.MessagesV2,
-        MessageReadStatusModel_1.MessageReadStatus
+        ShifttimesModel_1.ShiftDetails,
+        AttendanceModel_1.AttendanceDetails,
+        UserShiftModel_1.UserShift
     ],
 });

package/dist/index.d.ts

@@ -22,10 +22,6 @@ export * from './models/FaqsReactionsModel';
 export * from './models/ConversationModel';
 export * from './models/ConversationParticipantModel';
 export * from './models/MessageModel';
-export * from './models/ConversationsV2Model';
-export * from './models/ConversationParticipantsV2Model';
-export * from './models/MessagesV2Model';
-export * from './models/MessageReadStatusModel';
 export * from './models/FMServices';
 export * from './models/FMSubservices';
 export * from './models/serviceBookmarksModel';
@@ -38,4 +34,7 @@ export * from './models/PostReactionsModel';
 export * from './models/HelpContentModel';
 export * from './models/HelpContentCategoryModel';
 export * from './models/HelpContentAttachmentModel';
+export * from './models/ShifttimesModel';
+export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
+export * from './models/UserShiftModel';

package/dist/index.js

@@ -38,10 +38,6 @@ __exportStar(require("./models/FaqsReactionsModel"), exports);
 __exportStar(require("./models/ConversationModel"), exports);
 __exportStar(require("./models/ConversationParticipantModel"), exports);
 __exportStar(require("./models/MessageModel"), exports);
-__exportStar(require("./models/ConversationsV2Model"), exports);
-__exportStar(require("./models/ConversationParticipantsV2Model"), exports);
-__exportStar(require("./models/MessagesV2Model"), exports);
-__exportStar(require("./models/MessageReadStatusModel"), exports);
 __exportStar(require("./models/FMServices"), exports);
 __exportStar(require("./models/FMSubservices"), exports);
 __exportStar(require("./models/serviceBookmarksModel"), exports);
@@ -54,4 +50,7 @@ __exportStar(require("./models/PostReactionsModel"), exports);
 __exportStar(require("./models/HelpContentModel"), exports);
 __exportStar(require("./models/HelpContentCategoryModel"), exports);
 __exportStar(require("./models/HelpContentAttachmentModel"), exports);
+__exportStar(require("./models/ShifttimesModel"), exports);
+__exportStar(require("./models/AttendanceModel"), exports);
 __exportStar(require("./models/contactInfoModel"), exports);
+__exportStar(require("./models/UserShiftModel"), exports);

package/dist/models/AttendanceModel.d.ts

@@ -0,0 +1,19 @@
+import { BaseModel } from './BaseModel';
+export declare enum AttendanceStatus {
+    PRESENT = "PRESENT",
+    ABSENT = "ABSENT",
+    LEAVE = "LEAVE",
+    HALF_DAY = "HALF_DAY"
+}
+export declare class AttendanceDetails extends BaseModel {
+    user_id: string;
+    shift_id: number;
+    attendance_date: string;
+    check_in_time: string;
+    check_out_time: string;
+    first_half_status: AttendanceStatus;
+    second_half_status: AttendanceStatus;
+    attendance_status: AttendanceStatus;
+    excess_hours: string;
+    constructor(user_id: string, shift_id: number, attendance_date: string, check_in_time: string, check_out_time: string, first_half_status: AttendanceStatus, second_half_status: AttendanceStatus, attendance_status: AttendanceStatus, excess_hours: string);
+}

package/dist/models/AttendanceModel.js

@@ -0,0 +1,77 @@
+"use strict";
+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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.AttendanceDetails = exports.AttendanceStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+//CHECK (first_half_status IN ('Present', 'Absent', 'Leave')
+var AttendanceStatus;
+(function (AttendanceStatus) {
+    AttendanceStatus["PRESENT"] = "PRESENT";
+    AttendanceStatus["ABSENT"] = "ABSENT";
+    AttendanceStatus["LEAVE"] = "LEAVE";
+    AttendanceStatus["HALF_DAY"] = "HALF_DAY";
+})(AttendanceStatus || (exports.AttendanceStatus = AttendanceStatus = {}));
+let AttendanceDetails = class AttendanceDetails extends BaseModel_1.BaseModel {
+    constructor(user_id, shift_id, attendance_date, check_in_time, check_out_time, first_half_status, second_half_status, attendance_status, excess_hours) {
+        super();
+        this.user_id = user_id;
+        this.shift_id = shift_id;
+        this.attendance_date = attendance_date;
+        this.check_in_time = check_in_time;
+        this.check_out_time = check_out_time;
+        this.first_half_status = first_half_status;
+        this.second_half_status = second_half_status;
+        this.attendance_status = attendance_status;
+        this.excess_hours = excess_hours;
+    }
+};
+exports.AttendanceDetails = AttendanceDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AttendanceDetails.prototype, "shift_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true, unique: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "attendance_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "check_in_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "check_out_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "first_half_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "second_half_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "attendance_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], AttendanceDetails.prototype, "excess_hours", void 0);
+exports.AttendanceDetails = AttendanceDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'attendance_details' }),
+    __metadata("design:paramtypes", [String, Number, String, String, String, String, String, String, String])
+], AttendanceDetails);

package/dist/models/LeaveApprovalDetailsModel.d.ts

@@ -0,0 +1,13 @@
+import { BaseModel } from './BaseModel';
+export declare enum ApprovalStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class LeaveApprovalDetails extends BaseModel {
+    leave_request_id: number;
+    level: number;
+    approver_id: number;
+    approval_status: ApprovalStatus;
+    constructor(leave_request_id: number, approver_id: number, approval_status: ApprovalStatus, level: number);
+}

package/dist/models/LeaveApprovalDetailsModel.js

@@ -0,0 +1,51 @@
+"use strict";
+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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.LeaveApprovalDetails = exports.ApprovalStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var ApprovalStatus;
+(function (ApprovalStatus) {
+    ApprovalStatus["PENDING"] = "Pending";
+    ApprovalStatus["APPROVED"] = "Approved";
+    ApprovalStatus["REJECTED"] = "Rejected";
+})(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
+//This model is used to store the store the leave apporval details of the user for the leave request
+let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseModel {
+    constructor(leave_request_id, approver_id, approval_status, level) {
+        super();
+        this.leave_request_id = leave_request_id;
+        this.approver_id = approver_id;
+        this.approval_status = approval_status;
+        this.level = level;
+    }
+};
+exports.LeaveApprovalDetails = LeaveApprovalDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "leave_request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "approver_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING, nullable: false }),
+    __metadata("design:type", String)
+], LeaveApprovalDetails.prototype, "approval_status", void 0);
+exports.LeaveApprovalDetails = LeaveApprovalDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_details' }),
+    __metadata("design:paramtypes", [Number, Number, String, Number])
+], LeaveApprovalDetails);

package/dist/models/LeaveApprovalMatrixModel.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class LeaveApprovalMatrix extends BaseModel {
+    leave_type: number;
+    level: number;
+    approval_matrix: string;
+    constructor(leave_type: number, level: number, approval_matrix: string);
+}

package/dist/models/LeaveApprovalMatrixModel.js

@@ -0,0 +1,40 @@
+"use strict";
+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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.LeaveApprovalMatrix = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+//This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
+let LeaveApprovalMatrix = class LeaveApprovalMatrix extends BaseModel_1.BaseModel {
+    constructor(leave_type, level, approval_matrix) {
+        super();
+        this.leave_type = leave_type;
+        this.level = level;
+        this.approval_matrix = approval_matrix;
+    }
+};
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "leave_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], LeaveApprovalMatrix.prototype, "approval_matrix", void 0);
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_matrix' }),
+    __metadata("design:paramtypes", [Number, Number, String])
+], LeaveApprovalMatrix);

package/dist/models/ShifttimesModel.d.ts

@@ -0,0 +1,11 @@
+import { BaseModel } from './BaseModel';
+export declare class ShiftDetails extends BaseModel {
+    shift_name: string;
+    start_time: string;
+    end_time: string;
+    first_session_start_time: string;
+    first_session_end_time: string;
+    second_session_start_time: string;
+    second_session_end_time: string;
+    constructor(shift_name: string, start_time: string, end_time: string, first_session_start_time: string, first_session_end_time: string, second_session_start_time: string, second_session_end_time: string);
+}

package/dist/models/ShifttimesModel.js

@@ -0,0 +1,59 @@
+"use strict";
+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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.ShiftDetails = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ShiftDetails = class ShiftDetails extends BaseModel_1.BaseModel {
+    constructor(shift_name, start_time, end_time, first_session_start_time, first_session_end_time, second_session_start_time, second_session_end_time) {
+        super();
+        this.shift_name = shift_name;
+        this.start_time = start_time;
+        this.end_time = end_time;
+        this.first_session_start_time = first_session_start_time;
+        this.first_session_end_time = first_session_end_time;
+        this.second_session_start_time = second_session_start_time;
+        this.second_session_end_time = second_session_end_time;
+    }
+};
+exports.ShiftDetails = ShiftDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "shift_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "start_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "end_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "first_session_start_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "first_session_end_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "second_session_start_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", String)
+], ShiftDetails.prototype, "second_session_end_time", void 0);
+exports.ShiftDetails = ShiftDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'shift_details' }),
+    __metadata("design:paramtypes", [String, String, String, String, String, String, String])
+], ShiftDetails);

package/dist/models/UserShiftModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class UserShift extends BaseModel {
+    user_id: string;
+    shift_id: number;
+    constructor(user_id: string, shift_id: number);
+}

package/dist/models/{questionTagsModel.js → UserShiftModel.js}

@@ -9,26 +9,26 @@ 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.QuestionTags = void 0;
+exports.UserShift = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-let QuestionTags = class QuestionTags extends BaseModel_1.BaseModel {
-    constructor(name, question_Id) {
+let UserShift = class UserShift extends BaseModel_1.BaseModel {
+    constructor(user_id, shift_id) {
         super();
-        this.name = name,
-            this.question_Id = question_Id;
+        this.user_id = user_id;
+        this.shift_id = shift_id;
     }
 };
-exports.QuestionTags = QuestionTags;
+exports.UserShift = UserShift;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)
-], QuestionTags.prototype, "name", void 0);
+], UserShift.prototype, "user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], QuestionTags.prototype, "question_Id", void 0);
-exports.QuestionTags = QuestionTags = __decorate([
-    (0, typeorm_1.Entity)({ name: 'question_tags' }),
+], UserShift.prototype, "shift_id", void 0);
+exports.UserShift = UserShift = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_shift' }),
     __metadata("design:paramtypes", [String, Number])
-], QuestionTags);
+], UserShift);

package/package.json

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

package/src/data-source.ts

@@ -43,10 +43,9 @@ import { HelpContent } from './models/HelpContentModel';
 import { HelpContentCategories } from './models/HelpContentCategoryModel';
 import { HelpContentAttachments } from './models/HelpContentAttachmentModel';
 import { ContactInfo } from './models/contactInfoModel';
-import { ConversationsV2 } from './models/ConversationsV2Model';
-import { ConversationParticipantsV2 } from './models/ConversationParticipantsV2Model';
-import { MessagesV2 } from './models/MessagesV2Model';
-import { MessageReadStatus } from './models/MessageReadStatusModel';
+import { ShiftDetails } from './models/ShifttimesModel';
+import { AttendanceDetails } from './models/AttendanceModel';
+import { UserShift } from './models/UserShiftModel';
 
 
 export const AppDataSource = new DataSource({
@@ -96,9 +95,8 @@ export const AppDataSource = new DataSource({
     HelpContentCategories,
     HelpContentAttachments,
     ContactInfo,
-    ConversationsV2,
-    ConversationParticipantsV2,
-    MessagesV2,
-    MessageReadStatus
+    ShiftDetails,
+    AttendanceDetails,
+    UserShift
   ],
 });

package/src/index.ts

@@ -22,10 +22,6 @@ export * from './models/FaqsReactionsModel';
 export * from './models/ConversationModel';
 export * from './models/ConversationParticipantModel';
 export * from './models/MessageModel';
-export * from './models/ConversationsV2Model';
-export * from './models/ConversationParticipantsV2Model';
-export * from './models/MessagesV2Model';
-export * from './models/MessageReadStatusModel';
 export * from './models/FMServices';
 export * from './models/FMSubservices';
 export * from './models/serviceBookmarksModel';
@@ -38,4 +34,7 @@ export * from './models/PostReactionsModel';
 export * from './models/HelpContentModel';
 export * from './models/HelpContentCategoryModel';
 export * from './models/HelpContentAttachmentModel';
+export * from './models/ShifttimesModel';
+export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
+export * from './models/UserShiftModel';

package/src/models/AttendanceModel.ts

@@ -0,0 +1,64 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+//CHECK (first_half_status IN ('Present', 'Absent', 'Leave')
+export enum AttendanceStatus {
+    PRESENT = 'PRESENT',
+    ABSENT = 'ABSENT',
+    LEAVE = 'LEAVE',
+    HALF_DAY = 'HALF_DAY',
+}
+
+@Entity({ name: 'attendance_details' })
+export class AttendanceDetails extends BaseModel {
+
+    //user_id, shift_name, check_in_time, check_out_time
+    @Column({ type: 'varchar', nullable: true })
+    user_id: string;
+
+    @Column({ type: 'int', nullable: true })
+    shift_id: number;
+
+    @Column({ type: 'date', nullable: true , unique: true})
+    attendance_date: string;
+
+    @Column({ type: 'time', nullable: true })
+    check_in_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    check_out_time: string;
+
+    @Column({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true })
+    first_half_status: AttendanceStatus;
+
+    @Column({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true })
+    second_half_status: AttendanceStatus;
+
+    @Column({ type: 'varchar', default: AttendanceStatus.PRESENT, nullable: true })
+    attendance_status: AttendanceStatus;
+
+    @Column({ type: 'time', nullable: true })
+    excess_hours : string
+
+    constructor( 
+        user_id: string,
+        shift_id: number,
+        attendance_date: string,
+        check_in_time: string,
+        check_out_time: string,
+        first_half_status: AttendanceStatus,
+        second_half_status: AttendanceStatus,
+        attendance_status: AttendanceStatus,
+        excess_hours: string) {
+        super();
+        this.user_id = user_id;
+        this.shift_id = shift_id;
+        this.attendance_date = attendance_date;
+        this.check_in_time = check_in_time;
+        this.check_out_time = check_out_time;
+        this.first_half_status = first_half_status;
+        this.second_half_status = second_half_status;
+        this.attendance_status = attendance_status;
+        this.excess_hours = excess_hours;
+    }
+}

package/src/models/ShifttimesModel.ts

@@ -0,0 +1,46 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'shift_details' })
+export class ShiftDetails extends BaseModel {
+
+    //shift_name, start_time, end_time
+    @Column({ type: 'varchar', nullable: true })
+    shift_name: string;
+
+    @Column({ type: 'time', nullable: true })
+    start_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    end_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    first_session_start_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    first_session_end_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    second_session_start_time: string;
+
+    @Column({ type: 'time', nullable: true })
+    second_session_end_time: string;
+
+    constructor( 
+        shift_name: string,
+        start_time: string,
+        end_time: string,
+        first_session_start_time: string,
+        first_session_end_time: string,
+        second_session_start_time: string,
+        second_session_end_time: string) {
+        super();
+        this.shift_name = shift_name;
+        this.start_time = start_time;
+        this.end_time = end_time;
+        this.first_session_start_time = first_session_start_time;
+        this.first_session_end_time = first_session_end_time;
+        this.second_session_start_time = second_session_start_time;
+        this.second_session_end_time = second_session_end_time;
+    }
+}

package/src/models/UserShiftModel.ts

@@ -0,0 +1,18 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'user_shift' })
+export class UserShift extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    user_id: string;
+
+    @Column({ type: 'int', nullable: true })
+    shift_id: number;
+
+    constructor(user_id: string, shift_id: number) {
+        super();
+        this.user_id = user_id;
+        this.shift_id = shift_id;
+    }
+}

package/dist/models/ConversationParticipantsV2Model.d.ts

@@ -1,15 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { ConversationsV2 } from './ConversationsV2Model';
-import { User } from './user';
-export declare class ConversationParticipantsV2 extends BaseModel {
-    conversation_id: number;
-    user_id: number;
-    joined_at: Date;
-    left_at?: Date;
-    is_admin: boolean;
-    unread_count: number;
-    last_read_at?: Date;
-    conversation?: ConversationsV2;
-    user?: User;
-    constructor();
-}

package/dist/models/ConversationParticipantsV2Model.js

@@ -1,69 +0,0 @@
-"use strict";
-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);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-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.ConversationParticipantsV2 = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const ConversationsV2Model_1 = require("./ConversationsV2Model");
-const user_1 = require("./user");
-let ConversationParticipantsV2 = class ConversationParticipantsV2 extends BaseModel_1.BaseModel {
-    constructor() {
-        super();
-        this.conversation_id = 0;
-        this.user_id = 0;
-        this.joined_at = new Date();
-        this.is_admin = false;
-        this.unread_count = 0;
-    }
-};
-exports.ConversationParticipantsV2 = ConversationParticipantsV2;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ConversationParticipantsV2.prototype, "conversation_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ConversationParticipantsV2.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], ConversationParticipantsV2.prototype, "joined_at", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
-    __metadata("design:type", Date)
-], ConversationParticipantsV2.prototype, "left_at", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], ConversationParticipantsV2.prototype, "is_admin", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', default: 0 }),
-    __metadata("design:type", Number)
-], ConversationParticipantsV2.prototype, "unread_count", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
-    __metadata("design:type", Date)
-], ConversationParticipantsV2.prototype, "last_read_at", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => ConversationsV2Model_1.ConversationsV2, conversation => conversation.participants),
-    (0, typeorm_1.JoinColumn)({ name: 'conversation_id' }),
-    __metadata("design:type", ConversationsV2Model_1.ConversationsV2)
-], ConversationParticipantsV2.prototype, "conversation", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => user_1.User),
-    (0, typeorm_1.JoinColumn)({ name: 'user_id' }),
-    __metadata("design:type", user_1.User)
-], ConversationParticipantsV2.prototype, "user", void 0);
-exports.ConversationParticipantsV2 = ConversationParticipantsV2 = __decorate([
-    (0, typeorm_1.Entity)({ name: 'conversation_participants_v2' }),
-    __metadata("design:paramtypes", [])
-], ConversationParticipantsV2);

package/dist/models/ConversationsV2Model.d.ts

@@ -1,15 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { ConversationParticipantsV2 } from './ConversationParticipantsV2Model';
-import { MessagesV2 } from './MessagesV2Model';
-export declare enum ConversationTypeV2 {
-    DIRECT = "direct",
-    GROUP = "group"
-}
-export declare class ConversationsV2 extends BaseModel {
-    conversation_type: ConversationTypeV2;
-    conversation_name?: string;
-    last_message_at: Date;
-    participants?: ConversationParticipantsV2[];
-    messages?: MessagesV2[];
-    constructor();
-}

package/dist/models/ConversationsV2Model.js

@@ -1,57 +0,0 @@
-"use strict";
-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);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-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.ConversationsV2 = exports.ConversationTypeV2 = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const ConversationParticipantsV2Model_1 = require("./ConversationParticipantsV2Model");
-const MessagesV2Model_1 = require("./MessagesV2Model");
-var ConversationTypeV2;
-(function (ConversationTypeV2) {
-    ConversationTypeV2["DIRECT"] = "direct";
-    ConversationTypeV2["GROUP"] = "group";
-})(ConversationTypeV2 || (exports.ConversationTypeV2 = ConversationTypeV2 = {}));
-let ConversationsV2 = class ConversationsV2 extends BaseModel_1.BaseModel {
-    constructor() {
-        super();
-        this.conversation_type = ConversationTypeV2.DIRECT;
-        this.last_message_at = new Date();
-    }
-};
-exports.ConversationsV2 = ConversationsV2;
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: ConversationTypeV2,
-        default: ConversationTypeV2.DIRECT
-    }),
-    __metadata("design:type", String)
-], ConversationsV2.prototype, "conversation_type", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", String)
-], ConversationsV2.prototype, "conversation_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], ConversationsV2.prototype, "last_message_at", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)(() => ConversationParticipantsV2Model_1.ConversationParticipantsV2, participant => participant.conversation),
-    __metadata("design:type", Array)
-], ConversationsV2.prototype, "participants", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)(() => MessagesV2Model_1.MessagesV2, message => message.conversation),
-    __metadata("design:type", Array)
-], ConversationsV2.prototype, "messages", void 0);
-exports.ConversationsV2 = ConversationsV2 = __decorate([
-    (0, typeorm_1.Entity)({ name: 'conversations_v2' }),
-    __metadata("design:paramtypes", [])
-], ConversationsV2);

package/dist/models/MessageReadStatusModel.d.ts

@@ -1,11 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { MessagesV2 } from './MessagesV2Model';
-import { User } from './user';
-export declare class MessageReadStatus extends BaseModel {
-    message_id: number;
-    user_id: number;
-    read_at: Date;
-    message?: MessagesV2;
-    user?: User;
-    constructor();
-}

package/dist/models/MessageReadStatusModel.js

@@ -1,51 +0,0 @@
-"use strict";
-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);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-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.MessageReadStatus = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const MessagesV2Model_1 = require("./MessagesV2Model");
-const user_1 = require("./user");
-let MessageReadStatus = class MessageReadStatus extends BaseModel_1.BaseModel {
-    constructor() {
-        super();
-        this.message_id = 0;
-        this.user_id = 0;
-        this.read_at = new Date();
-    }
-};
-exports.MessageReadStatus = MessageReadStatus;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], MessageReadStatus.prototype, "message_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], MessageReadStatus.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], MessageReadStatus.prototype, "read_at", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => MessagesV2Model_1.MessagesV2, message => message.readStatuses),
-    (0, typeorm_1.JoinColumn)({ name: 'message_id' }),
-    __metadata("design:type", MessagesV2Model_1.MessagesV2)
-], MessageReadStatus.prototype, "message", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => user_1.User),
-    (0, typeorm_1.JoinColumn)({ name: 'user_id' }),
-    __metadata("design:type", user_1.User)
-], MessageReadStatus.prototype, "user", void 0);
-exports.MessageReadStatus = MessageReadStatus = __decorate([
-    (0, typeorm_1.Entity)({ name: 'message_read_status' }),
-    __metadata("design:paramtypes", [])
-], MessageReadStatus);

package/dist/models/MessagesV2Model.d.ts

@@ -1,24 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { ConversationsV2 } from './ConversationsV2Model';
-import { User } from './user';
-import { MessageReadStatus } from './MessageReadStatusModel';
-export declare enum MessageTypeV2 {
-    TEXT = "text",
-    IMAGE = "image",
-    FILE = "file",
-    VIDEO = "video"
-}
-export declare class MessagesV2 extends BaseModel {
-    conversation_id: number;
-    sender_id: number;
-    message_type: MessageTypeV2;
-    content: string;
-    attachment_url?: string;
-    attachment_name?: string;
-    reply_to_message_id?: number;
-    conversation?: ConversationsV2;
-    sender?: User;
-    replyToMessage?: MessagesV2;
-    readStatuses?: MessageReadStatus[];
-    constructor();
-}

package/dist/models/MessagesV2Model.js

@@ -1,89 +0,0 @@
-"use strict";
-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);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-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.MessagesV2 = exports.MessageTypeV2 = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const ConversationsV2Model_1 = require("./ConversationsV2Model");
-const user_1 = require("./user");
-const MessageReadStatusModel_1 = require("./MessageReadStatusModel");
-var MessageTypeV2;
-(function (MessageTypeV2) {
-    MessageTypeV2["TEXT"] = "text";
-    MessageTypeV2["IMAGE"] = "image";
-    MessageTypeV2["FILE"] = "file";
-    MessageTypeV2["VIDEO"] = "video";
-})(MessageTypeV2 || (exports.MessageTypeV2 = MessageTypeV2 = {}));
-let MessagesV2 = class MessagesV2 extends BaseModel_1.BaseModel {
-    constructor() {
-        super();
-        this.conversation_id = 0;
-        this.sender_id = 0;
-        this.message_type = MessageTypeV2.TEXT;
-        this.content = '';
-    }
-};
-exports.MessagesV2 = MessagesV2;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], MessagesV2.prototype, "conversation_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], MessagesV2.prototype, "sender_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: MessageTypeV2,
-        default: MessageTypeV2.TEXT
-    }),
-    __metadata("design:type", String)
-], MessagesV2.prototype, "message_type", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
-    __metadata("design:type", String)
-], MessagesV2.prototype, "content", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
-    __metadata("design:type", String)
-], MessagesV2.prototype, "attachment_url", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", String)
-], MessagesV2.prototype, "attachment_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
-    __metadata("design:type", Number)
-], MessagesV2.prototype, "reply_to_message_id", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => ConversationsV2Model_1.ConversationsV2, conversation => conversation.messages),
-    (0, typeorm_1.JoinColumn)({ name: 'conversation_id' }),
-    __metadata("design:type", ConversationsV2Model_1.ConversationsV2)
-], MessagesV2.prototype, "conversation", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => user_1.User),
-    (0, typeorm_1.JoinColumn)({ name: 'sender_id' }),
-    __metadata("design:type", user_1.User)
-], MessagesV2.prototype, "sender", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => MessagesV2, { nullable: true }),
-    (0, typeorm_1.JoinColumn)({ name: 'reply_to_message_id' }),
-    __metadata("design:type", MessagesV2)
-], MessagesV2.prototype, "replyToMessage", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)(() => MessageReadStatusModel_1.MessageReadStatus, readStatus => readStatus.message),
-    __metadata("design:type", Array)
-], MessagesV2.prototype, "readStatuses", void 0);
-exports.MessagesV2 = MessagesV2 = __decorate([
-    (0, typeorm_1.Entity)({ name: 'messages_v2' }),
-    __metadata("design:paramtypes", [])
-], MessagesV2);

package/dist/models/questionTagsModel.d.ts

@@ -1,6 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class QuestionTags extends BaseModel {
-    name: string;
-    question_Id: number;
-    constructor(name: string, question_Id: number);
-}

package/src/models/ConversationParticipantsV2Model.ts

@@ -1,48 +0,0 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ConversationsV2 } from './ConversationsV2Model';
-import { User } from './user';
-
-@Entity({ name: 'conversation_participants_v2' })
-export class ConversationParticipantsV2 extends BaseModel {
-    
-    @Column({ type: 'int', nullable: false })
-    conversation_id: number;
-
-    @Column({ type: 'int', nullable: false })
-    user_id: number;
-
-    @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-    joined_at: Date;
-
-    @Column({ type: 'timestamp', nullable: true })
-    left_at?: Date;
-
-    @Column({ type: 'boolean', default: false })
-    is_admin: boolean;
-
-    @Column({ type: 'int', default: 0 })
-    unread_count: number;
-
-    @Column({ type: 'timestamp', nullable: true })
-    last_read_at?: Date;
-
-    // Relations
-    @ManyToOne(() => ConversationsV2, conversation => conversation.participants)
-    @JoinColumn({ name: 'conversation_id' })
-    conversation?: ConversationsV2;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'user_id' })
-    user?: User;
-
-    constructor() {
-        super();
-        this.conversation_id = 0;
-        this.user_id = 0;
-        this.joined_at = new Date();
-        this.is_admin = false;
-        this.unread_count = 0;
-    }
-}
-

package/src/models/ConversationsV2Model.ts

@@ -1,41 +0,0 @@
-import { Column, Entity, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ConversationParticipantsV2 } from './ConversationParticipantsV2Model';
-import { MessagesV2 } from './MessagesV2Model';
-
-export enum ConversationTypeV2 {
-    DIRECT = "direct",
-    GROUP = "group"
-}
-
-@Entity({ name: 'conversations_v2' })
-export class ConversationsV2 extends BaseModel {
-    
-    @Column({ 
-        type: 'enum', 
-        enum: ConversationTypeV2, 
-        default: ConversationTypeV2.DIRECT 
-    })
-    conversation_type: ConversationTypeV2;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    conversation_name?: string;
-
-
-    @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-    last_message_at: Date;
-
-    // Relations
-    @OneToMany(() => ConversationParticipantsV2, participant => participant.conversation)
-    participants?: ConversationParticipantsV2[];
-
-    @OneToMany(() => MessagesV2, message => message.conversation)
-    messages?: MessagesV2[];
-
-    constructor() {
-        super();
-        this.conversation_type = ConversationTypeV2.DIRECT;
-        this.last_message_at = new Date();
-    } 
-}
-

package/src/models/MessageReadStatusModel.ts

@@ -1,34 +0,0 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { MessagesV2 } from './MessagesV2Model';
-import { User } from './user';
-
-@Entity({ name: 'message_read_status' })
-export class MessageReadStatus extends BaseModel {
-    
-    @Column({ type: 'int', nullable: false })
-    message_id: number;
-
-    @Column({ type: 'int', nullable: false })
-    user_id: number;
-
-    @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-    read_at: Date;
-
-    // Relations
-    @ManyToOne(() => MessagesV2, message => message.readStatuses)
-    @JoinColumn({ name: 'message_id' })
-    message?: MessagesV2;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'user_id' })
-    user?: User;
-
-    constructor() {
-        super();
-        this.message_id = 0;
-        this.user_id = 0;
-        this.read_at = new Date();
-    }
-}
-

package/src/models/MessagesV2Model.ts

@@ -1,66 +0,0 @@
-import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ConversationsV2 } from './ConversationsV2Model';
-import { User } from './user';
-import { MessageReadStatus } from './MessageReadStatusModel';
-
-export enum MessageTypeV2 {
-    TEXT = "text",
-    IMAGE = "image",
-    FILE = "file",
-    VIDEO = "video"
-}
-
-@Entity({ name: 'messages_v2' })
-export class MessagesV2 extends BaseModel {
-    
-    @Column({ type: 'int', nullable: false })
-    conversation_id: number;
-
-    @Column({ type: 'int', nullable: false })
-    sender_id: number;
-
-    @Column({ 
-        type: 'enum', 
-        enum: MessageTypeV2, 
-        default: MessageTypeV2.TEXT 
-    })
-    message_type: MessageTypeV2;
-
-    @Column({ type: 'text', nullable: false })
-    content: string;
-
-    @Column({ type: 'varchar', length: 500, nullable: true })
-    attachment_url?: string;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    attachment_name?: string;
-
-    @Column({ type: 'int', nullable: true })
-    reply_to_message_id?: number;
-
-    // Relations
-    @ManyToOne(() => ConversationsV2, conversation => conversation.messages)
-    @JoinColumn({ name: 'conversation_id' })
-    conversation?: ConversationsV2;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'sender_id' })
-    sender?: User;
-
-    @ManyToOne(() => MessagesV2, { nullable: true })
-    @JoinColumn({ name: 'reply_to_message_id' })
-    replyToMessage?: MessagesV2;
-
-    @OneToMany(() => MessageReadStatus, readStatus => readStatus.message)
-    readStatuses?: MessageReadStatus[];
-
-    constructor() {
-        super();
-        this.conversation_id = 0;
-        this.sender_id = 0;
-        this.message_type = MessageTypeV2.TEXT;
-        this.content = '';
-    }
-}
-