Merge pull request #22 from abhishekmalvadkar/feature/GH-112_role_based_menu_changes

GH-112 : Role based menu changes and migrated from string primary key to integer primary key

Author: abhishekmalvadkar

src/main/java/com/amalvadkar/ihms/common/entities/AbstractBaseEntity.java

@@ -35,6 +35,7 @@ public abstract class AbstractBaseEntity extends AbstractDeleteFlagBaseEntity {
     @PrePersist
     public void prePersistForBaseEntity() {
         this.createdOn = Instant.now();
+        this.updatedOn = Instant.now();
     }
 
     @PreUpdate

src/main/java/com/amalvadkar/ihms/common/entities/DepartmentEntity.java

@@ -0,0 +1,25 @@
+package com.amalvadkar.ihms.common.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "department")
+@Getter
+@Setter
+public class DepartmentEntity extends AbstractIdBaseEntity  {
+
+    @Column(name="name", nullable = false)
+    private String name;
+
+    @Column(name="code", nullable = false)
+    private String code;
+
+    @Column(name="description")
+    private String description;
+
+
+}

src/main/java/com/amalvadkar/ihms/common/entities/FeedBackEntity.java

@@ -19,7 +19,7 @@
 @Table(name = "feedback")
 @Getter
 @Setter
-public class FeedBackEntity extends AbstractStringIdBaseEntity {
+public class FeedBackEntity extends AbstractIdBaseEntity {
 
     @Column(name = "title", nullable = false)
     private String title;

src/main/java/com/amalvadkar/ihms/common/entities/FileMetadataEntity.java

@@ -13,14 +13,14 @@
 @Table(name = "files_metadata")
 @Getter
 @Setter
-public class FileMetadataEntity extends AbstractStringIdBaseEntity  {
+public class FileMetadataEntity extends AbstractIdBaseEntity  {
 
     @Column(name = "category", nullable = false)
     @Enumerated(EnumType.STRING)
     private CategoryEnum categoryEnum;
 
     @Column(name = "record_id", nullable = false)
-    private String recordId;
+    private Long recordId;
 
     @Column(name = "file_name", nullable = false)
     private String fileName;

src/main/java/com/amalvadkar/ihms/common/entities/HeaderConfigEntity.java

@@ -0,0 +1,41 @@
+package com.amalvadkar.ihms.common.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "header_config")
+@Getter
+@Setter
+public class HeaderConfigEntity extends AbstractIdBaseEntity {
+
+    @Column(name = "header_name")
+    private String headerName;
+
+    @Column(name = "header_type", nullable = false)
+    private String headerType;
+
+    @Column(name = "mapping_name")
+    private String mappingName;
+
+    @Column(name = "mapping_column")
+    private String mappingColumn;
+
+    @Column(name = "mapping_table")
+    private String mappingTable;
+
+    @Column(name = "sort_by")
+    private String sortBy;
+
+    @Column(name = "sortable")
+    private Boolean sortable;
+
+    @Column(name = "confirm_need")
+    private Boolean confirmNeed;
+
+    @Column(name = "blankable")
+    private Boolean blankable;
+}

src/main/java/com/amalvadkar/ihms/common/entities/HeaderMappingEntity.java

@@ -0,0 +1,27 @@
+package com.amalvadkar.ihms.common.entities;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Entity
+@Table(name = "header_mapping")
+@Getter
+@Setter
+public class HeaderMappingEntity extends AbstractIdBaseEntity {
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "header_config_id")
+    private HeaderConfigEntity headerConfigEntity;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "role_menu_id")
+    private RoleMenuEntity roleMenuEntity;
+
+    private Boolean editable;
+    private BigDecimal displayOrder;
+    private Boolean isDefault;
+
+}

src/main/java/com/amalvadkar/ihms/common/entities/MenuEntity.java

@@ -0,0 +1,36 @@
+package com.amalvadkar.ihms.common.entities;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Entity
+@Table(name = "menu")
+@Getter
+@Setter
+public class MenuEntity extends AbstractIdBaseEntity {
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "code", nullable = false)
+    private String code;
+
+    @Column(name="route")
+    private String route;
+
+    @Column(name="description")
+    private String description;
+
+    @Column(name="device")
+    private String device;
+
+    @Column(name="menu_order")
+    private BigDecimal menuOrder;
+
+    @Column(name="parent_id", nullable = false)
+    private Long parentId;
+
+}

src/main/java/com/amalvadkar/ihms/common/entities/RoleEntity.java

@@ -1,20 +1,25 @@
 package com.amalvadkar.ihms.common.entities;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 
 @Entity
 @Table(name = "role")
 @Getter
 @Setter
-public class RoleEntity extends AbstractStringIdBaseEntity {
+public class RoleEntity extends AbstractIdBaseEntity {
 
     @Column(name = "name", nullable = false)
     private String name;
 
     @Column(name = "code", nullable = false)
     private String code;
+
+    @Column(name = "description")
+    private String description;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "dept_id" , nullable = false)
+    private DepartmentEntity departmentEntity;
 }

src/main/java/com/amalvadkar/ihms/common/entities/RoleMenuEntity.java

@@ -0,0 +1,22 @@
+package com.amalvadkar.ihms.common.entities;
+
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "role_menu")
+@Getter
+@Setter
+public class RoleMenuEntity extends AbstractIdBaseEntity {
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "role_id", nullable = false)
+    private RoleEntity roleEntity;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "menu_id", nullable = false)
+    private MenuEntity menuEntity;
+
+}

src/main/java/com/amalvadkar/ihms/common/models/dto/FetchFilesContentDTO.java

@@ -2,5 +2,5 @@
 
 import java.time.Instant;
 
-public record FetchFilesContentDTO(String fileId, String fileName, String uploadedBy, Instant uploadedOn) {
+public record FetchFilesContentDTO(Long fileId, String fileName, String uploadedBy, Instant uploadedOn) {
 }