diff --git a/app/module/article_category_details/request/article_category_details.request.go b/app/module/article_category_details/request/article_category_details.request.go index 5959351..2bb22b6 100644 --- a/app/module/article_category_details/request/article_category_details.request.go +++ b/app/module/article_category_details/request/article_category_details.request.go @@ -11,16 +11,16 @@ type ArticleCategoryDetailsGeneric interface { } type ArticleCategoryDetailsQueryRequest struct { - ArticleId int `json:"article_id" validate:"required"` - CategoryId int `json:"category_id" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` + ArticleId int `json:"articleId" validate:"required"` + CategoryId int `json:"categoryId" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type ArticleCategoryDetailsCreateRequest struct { - ArticleId uint `json:"article_id" validate:"required"` - CategoryId int `json:"category_id" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` + ArticleId uint `json:"articleId" validate:"required"` + CategoryId int `json:"categoryId" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` } func (req ArticleCategoryDetailsCreateRequest) ToEntity() *article_category_details.ArticleCategoryDetails { @@ -33,11 +33,11 @@ func (req ArticleCategoryDetailsCreateRequest) ToEntity() *article_category_deta type ArticleCategoryDetailsUpdateRequest struct { ID uint `json:"id" validate:"required"` - ArticleId uint `json:"article_id" validate:"required"` - CategoryId int `json:"category_id" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + ArticleId uint `json:"articleId" validate:"required"` + CategoryId int `json:"categoryId" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } func (req ArticleCategoryDetailsUpdateRequest) ToEntity() *article_category_details.ArticleCategoryDetails { diff --git a/app/module/article_category_details/response/article_category_details.response.go b/app/module/article_category_details/response/article_category_details.response.go index d2e1bf7..3daadb9 100644 --- a/app/module/article_category_details/response/article_category_details.response.go +++ b/app/module/article_category_details/response/article_category_details.response.go @@ -4,9 +4,9 @@ import "time" type ArticleCategoryDetailsResponse struct { ID uint `json:"id"` - ArticleId uint `json:"article_id"` - CategoryId int `json:"category_id"` - IsActive bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + ArticleId uint `json:"articleId"` + CategoryId int `json:"categoryId"` + IsActive bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/article_files/response/article_files.response.go b/app/module/article_files/response/article_files.response.go index 465d9d2..0993739 100644 --- a/app/module/article_files/response/article_files.response.go +++ b/app/module/article_files/response/article_files.response.go @@ -4,21 +4,21 @@ import "time" type ArticleFilesResponse struct { ID uint `json:"id"` - ArticleId uint `json:"article_id"` - FilePath *string `json:"file_path"` - FileUrl *string `json:"file_url"` - FileName *string `json:"file_name"` - FileThumbnail *string `json:"file_thumbnail"` - FileAlt *string `json:"file_alt"` - WidthPixel *string `json:"width_pixel"` - HeightPixel *string `json:"height_pixel"` + ArticleId uint `json:"articleId"` + FilePath *string `json:"filePath"` + FileUrl *string `json:"fileUrl"` + FileName *string `json:"fileName"` + FileThumbnail *string `json:"fileThumbnail"` + FileAlt *string `json:"fileAlt"` + WidthPixel *string `json:"widthPixel"` + HeightPixel *string `json:"heightPixel"` Size *string `json:"size"` - DownloadCount *int `json:"download_count"` - CreatedById int `json:"created_by_id"` - StatusId int `json:"status_id"` - IsPublish *bool `json:"is_publish"` - PublishedAt *time.Time `json:"published_at"` - IsActive bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + DownloadCount *int `json:"downloadCount"` + CreatedById int `json:"createdById"` + StatusId int `json:"statusId"` + IsPublish *bool `json:"isPublish"` + PublishedAt *time.Time `json:"publishedAt"` + IsActive bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/chat_history/request/chat_history.request.go b/app/module/chat_history/request/chat_history.request.go index f06b6d6..269d809 100644 --- a/app/module/chat_history/request/chat_history.request.go +++ b/app/module/chat_history/request/chat_history.request.go @@ -7,16 +7,16 @@ import ( // Chat History Sessions Request DTOs type ChatHistorySessionsQueryRequest struct { - UserID *uint `json:"user_id"` - AgentID *string `json:"agent_id"` - SessionID *string `json:"session_id"` + UserID *uint `json:"userId"` + AgentID *string `json:"agentId"` + SessionID *string `json:"sessionId"` Pagination *paginator.Pagination `json:"pagination"` } type ChatHistorySessionsCreateRequest struct { - UserID uint `json:"user_id" validate:"required"` - AgentID string `json:"agent_id" validate:"required"` - SessionID string `json:"session_id" validate:"required"` + UserID uint `json:"userId" validate:"required"` + AgentID string `json:"agentId" validate:"required"` + SessionID string `json:"sessionId" validate:"required"` Title *string `json:"title"` Messages []ChatMessageRequest `json:"messages"` } @@ -62,13 +62,13 @@ func (req ChatHistorySessionsUpdateRequest) ToEntity() *entity.ChatSessions { // Chat History Messages Request DTOs type ChatHistoryMessagesQueryRequest struct { - SessionID string `json:"session_id" validate:"required"` + SessionID string `json:"sessionId" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type ChatHistoryMessagesCreateRequest struct { - SessionID string `json:"session_id" validate:"required"` - MessageType string `json:"message_type" validate:"required,oneof=user assistant"` + SessionID string `json:"sessionId" validate:"required"` + MessageType string `json:"messageType" validate:"required,oneof=user assistant"` Content string `json:"content" validate:"required"` } @@ -92,9 +92,9 @@ func (req ChatHistoryMessagesUpdateRequest) ToEntity() *entity.ChatMessagesNew { // Context Request DTOs for query parameters type ChatHistorySessionsQueryRequestContext struct { - UserID string `json:"user_id"` - AgentID string `json:"agent_id"` - SessionID string `json:"session_id"` + UserID string `json:"userId"` + AgentID string `json:"agentId"` + SessionID string `json:"sessionId"` } func (req ChatHistorySessionsQueryRequestContext) ToParamRequest() ChatHistorySessionsQueryRequest { @@ -117,7 +117,7 @@ func (req ChatHistorySessionsQueryRequestContext) ToParamRequest() ChatHistorySe } type ChatHistoryMessagesQueryRequestContext struct { - SessionID string `json:"session_id"` + SessionID string `json:"sessionId"` } func (req ChatHistoryMessagesQueryRequestContext) ToParamRequest() ChatHistoryMessagesQueryRequest { diff --git a/app/module/chat_history/response/chat_history.response.go b/app/module/chat_history/response/chat_history.response.go index 0863b94..6aa169e 100644 --- a/app/module/chat_history/response/chat_history.response.go +++ b/app/module/chat_history/response/chat_history.response.go @@ -7,23 +7,23 @@ import ( // Chat History Sessions Response DTOs type ChatHistorySessionsResponse struct { ID uint `json:"id"` - SessionID string `json:"session_id"` - UserID uint `json:"user_id"` - AgentID string `json:"agent_id"` + SessionID string `json:"sessionId"` + UserID uint `json:"userId"` + AgentID string `json:"agentId"` Title string `json:"title"` - MessageCount int `json:"message_count"` + MessageCount int `json:"messageCount"` Status string `json:"status"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } // Chat History Messages Response DTOs type ChatHistoryMessagesResponse struct { ID uint `json:"id"` - SessionID string `json:"session_id"` - MessageType string `json:"message_type"` + SessionID string `json:"sessionId"` + MessageType string `json:"messageType"` Content string `json:"content"` - CreatedAt time.Time `json:"created_at"` + CreatedAt time.Time `json:"createdAt"` } // Combined Response for Session with Messages diff --git a/app/module/cities/request/cities.request.go b/app/module/cities/request/cities.request.go index 6bbeeaf..a1cf6f3 100644 --- a/app/module/cities/request/cities.request.go +++ b/app/module/cities/request/cities.request.go @@ -10,14 +10,14 @@ type CitiesGeneric interface { } type CitiesQueryRequest struct { - CityName string `json:"city_name" validate:"required"` - ProvId int `json:"prov_id" validate:"required"` + CityName string `json:"cityName" validate:"required"` + ProvId int `json:"provId" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type CitiesCreateRequest struct { - CityName string `json:"city_name" validate:"required"` - ProvId int `json:"prov_id" validate:"required"` + CityName string `json:"cityName" validate:"required"` + ProvId int `json:"provId" validate:"required"` } func (req CitiesCreateRequest) ToEntity() *entity.Cities { @@ -29,8 +29,8 @@ func (req CitiesCreateRequest) ToEntity() *entity.Cities { type CitiesUpdateRequest struct { ID uint `json:"id" validate:"required"` - CityName string `json:"city_name" validate:"required"` - ProvId int `json:"prov_id" validate:"required"` + CityName string `json:"cityName" validate:"required"` + ProvId int `json:"provId" validate:"required"` } func (req CitiesUpdateRequest) ToEntity() *entity.Cities { diff --git a/app/module/cities/response/cities.response.go b/app/module/cities/response/cities.response.go index 8941551..3ec3e8f 100644 --- a/app/module/cities/response/cities.response.go +++ b/app/module/cities/response/cities.response.go @@ -2,6 +2,6 @@ package response type CitiesResponse struct { ID uint `json:"id"` - CityName string `json:"city_name"` - ProvId int `json:"prov_id"` + CityName string `json:"cityName"` + ProvId int `json:"provId"` } diff --git a/app/module/custom_static_pages/request/custom_static_pages.request.go b/app/module/custom_static_pages/request/custom_static_pages.request.go index 33e46d5..0e35db7 100644 --- a/app/module/custom_static_pages/request/custom_static_pages.request.go +++ b/app/module/custom_static_pages/request/custom_static_pages.request.go @@ -41,7 +41,7 @@ type CustomStaticPagesUpdateRequest struct { Description string `json:"description"` Slug string `json:"slug" validate:"required"` HtmlBody string `json:"htmlBody" validate:"required"` - UpdatedAt time.Time `json:"updated_at"` + UpdatedAt time.Time `json:"updatedAt"` } func (req CustomStaticPagesUpdateRequest) ToEntity() *entity.CustomStaticPages { diff --git a/app/module/districts/response/districts.response.go b/app/module/districts/response/districts.response.go index 1efe096..f4b1329 100644 --- a/app/module/districts/response/districts.response.go +++ b/app/module/districts/response/districts.response.go @@ -2,6 +2,6 @@ package response type DistrictsResponse struct { ID uint `json:"id"` - DisNam string `json:"dis_nam"` - CityId int `json:"city_id"` + DisNam string `json:"disNam"` + CityId int `json:"cityId"` } diff --git a/app/module/master_menus/response/master_menus.response.go b/app/module/master_menus/response/master_menus.response.go index 3f814df..9ff070c 100644 --- a/app/module/master_menus/response/master_menus.response.go +++ b/app/module/master_menus/response/master_menus.response.go @@ -6,12 +6,12 @@ type MasterMenusResponse struct { ID uint `json:"id"` Name string `json:"name"` Description string `json:"description"` - ModuleId int `json:"module_id"` - ParentMenuId *int `json:"parent_menu_id"` + ModuleId int `json:"moduleId"` + ParentMenuId *int `json:"parentMenuId"` Icon *string `json:"icon"` Position *int `json:"position"` - StatusId int `json:"status_id"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + StatusId int `json:"statusId"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/master_modules/response/master_modules.response.go b/app/module/master_modules/response/master_modules.response.go index 9a80bf0..edfa5b2 100644 --- a/app/module/master_modules/response/master_modules.response.go +++ b/app/module/master_modules/response/master_modules.response.go @@ -6,9 +6,9 @@ type MasterModulesResponse struct { ID uint `json:"id"` Name string `json:"name"` Description string `json:"description"` - PathUrl string `json:"path_url"` - StatusId int `json:"status_id"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + PathUrl string `json:"pathUrl"` + StatusId int `json:"statusId"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/master_statuses/request/master_statuses.request.go b/app/module/master_statuses/request/master_statuses.request.go index d7489dc..b4766e0 100644 --- a/app/module/master_statuses/request/master_statuses.request.go +++ b/app/module/master_statuses/request/master_statuses.request.go @@ -11,13 +11,13 @@ type MasterStatusesGeneric interface { type MasterStatusesQueryRequest struct { Name string `json:"name" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type MasterStatusesCreateRequest struct { Name string `json:"name" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` } func (req MasterStatusesCreateRequest) ToEntity() *entity.MasterStatuses { @@ -30,7 +30,7 @@ func (req MasterStatusesCreateRequest) ToEntity() *entity.MasterStatuses { type MasterStatusesUpdateRequest struct { ID uint `json:"id" validate:"required"` Name string `json:"name" validate:"required"` - IsActive bool `json:"is_active" validate:"required"` + IsActive bool `json:"isActive" validate:"required"` } func (req MasterStatusesUpdateRequest) ToEntity() *entity.MasterStatuses { diff --git a/app/module/master_statuses/response/master_statuses.response.go b/app/module/master_statuses/response/master_statuses.response.go index 51f5765..5aa8f64 100644 --- a/app/module/master_statuses/response/master_statuses.response.go +++ b/app/module/master_statuses/response/master_statuses.response.go @@ -1,7 +1,7 @@ package response type MasterStatusesResponse struct { - ID uint `json:"id"` - Name string `json:"name"` - IsActive bool `json:"is_active"` -} \ No newline at end of file + ID uint `json:"id"` + Name string `json:"name"` + IsActive bool `json:"isActive"` +} diff --git a/app/module/provinces/request/provinces.request.go b/app/module/provinces/request/provinces.request.go index f50d2f1..20c9747 100644 --- a/app/module/provinces/request/provinces.request.go +++ b/app/module/provinces/request/provinces.request.go @@ -10,16 +10,16 @@ type ProvincesGeneric interface { } type ProvincesQueryRequest struct { - ProvName string `json:"prov_name" validate:"required"` - LocationId int `json:"location_id" validate:"required"` + ProvName string `json:"provName" validate:"required"` + LocationId int `json:"locationId" validate:"required"` Status int `json:"status" validate:"required"` Timezone string `json:"timezone" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type ProvincesCreateRequest struct { - ProvName string `json:"prov_name" validate:"required"` - LocationId int `json:"location_id" validate:"required"` + ProvName string `json:"provName" validate:"required"` + LocationId int `json:"locationId" validate:"required"` Status int `json:"status" validate:"required"` Timezone string `json:"timezone" validate:"required"` } @@ -35,8 +35,8 @@ func (req ProvincesCreateRequest) ToEntity() *entity.Provinces { type ProvincesUpdateRequest struct { ID uint `json:"id" validate:"required"` - ProvName string `json:"prov_name" validate:"required"` - LocationId int `json:"location_id" validate:"required"` + ProvName string `json:"provName" validate:"required"` + LocationId int `json:"locationId" validate:"required"` Status int `json:"status" validate:"required"` Timezone string `json:"timezone" validate:"required"` } diff --git a/app/module/provinces/response/provinces.response.go b/app/module/provinces/response/provinces.response.go index 0bfb39a..aa5b34a 100644 --- a/app/module/provinces/response/provinces.response.go +++ b/app/module/provinces/response/provinces.response.go @@ -2,8 +2,8 @@ package response type ProvincesResponse struct { ID uint `json:"id"` - ProvName string `json:"prov_name"` - LocationId int `json:"location_id"` + ProvName string `json:"provName"` + LocationId int `json:"locationId"` Status int `json:"status"` Timezone string `json:"timezone"` } diff --git a/app/module/user_role_accesses/entity/user_role_accesses.entity.go b/app/module/user_role_accesses/entity/user_role_accesses.entity.go index 3d1c58d..257a0f1 100644 --- a/app/module/user_role_accesses/entity/user_role_accesses.entity.go +++ b/app/module/user_role_accesses/entity/user_role_accesses.entity.go @@ -3,16 +3,16 @@ package entity import "time" type UserRoleAccesses struct { - ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"` - UserRoleId int `json:"user_role_id" gorm:"type:int4"` - MenuId int `json:"menu_id" gorm:"type:int4"` - IsViewEnabled bool `json:"is_view_enabled" gorm:"type:bool"` - IsInsertEnabled bool `json:"is_insert_enabled" gorm:"type:bool"` - IsUpdateEnabled bool `json:"is_update_enabled" gorm:"type:bool"` - IsDeleteEnabled bool `json:"is_delete_enabled" gorm:"type:bool"` - IsApprovalEnabled bool `json:"is_approval_enabled" gorm:"type:bool"` - IsAdminEnabled bool `json:"is_admin_enabled" gorm:"type:bool"` - IsActive bool `json:"is_active" gorm:"type:bool"` - CreatedAt time.Time `json:"created_at" gorm:"default:now()"` - UpdatedAt time.Time `json:"updated_at" gorm:"default:now()"` -} \ No newline at end of file + ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"` + UserRoleId int `json:"userRoleId" gorm:"type:int4"` + MenuId int `json:"menuId" gorm:"type:int4"` + IsViewEnabled bool `json:"isViewEnabled" gorm:"type:bool"` + IsInsertEnabled bool `json:"isInsertEnabled" gorm:"type:bool"` + IsUpdateEnabled bool `json:"isUpdateEnabled" gorm:"type:bool"` + IsDeleteEnabled bool `json:"isDeleteEnabled" gorm:"type:bool"` + IsApprovalEnabled bool `json:"isApprovalEnabled" gorm:"type:bool"` + IsAdminEnabled bool `json:"isAdminEnabled" gorm:"type:bool"` + IsActive bool `json:"isActive" gorm:"type:bool"` + CreatedAt time.Time `json:"createdAt" gorm:"default:now()"` + UpdatedAt time.Time `json:"updatedAt" gorm:"default:now()"` +} diff --git a/app/module/user_role_accesses/request/user_role_accesses.request.go b/app/module/user_role_accesses/request/user_role_accesses.request.go index 2935d84..e1c29fa 100644 --- a/app/module/user_role_accesses/request/user_role_accesses.request.go +++ b/app/module/user_role_accesses/request/user_role_accesses.request.go @@ -42,14 +42,14 @@ func (req UserRoleAccessesCreateRequest) ToEntity() *entity.UserRoleAccesses { type UserRoleAccessesUpdateRequest struct { ID uint `json:"id" validate:"required"` - UserRoleId uint `json:"user_role_id" validate:"required"` - MenuId int `json:"menu_id" validate:"required"` - IsViewEnabled bool `json:"is_view_enabled" validate:"required"` - IsInsertEnabled bool `json:"is_insert_enabled" validate:"required"` - IsUpdateEnabled bool `json:"is_update_enabled" validate:"required"` - IsDeleteEnabled bool `json:"is_delete_enabled" validate:"required"` - IsApprovalEnabled bool `json:"is_approval_enabled" validate:"required"` - IsAdminEnabled bool `json:"is_admin_enabled" validate:"required"` + UserRoleId uint `json:"userRoleId" validate:"required"` + MenuId int `json:"menuId" validate:"required"` + IsViewEnabled bool `json:"isViewEnabled" validate:"required"` + IsInsertEnabled bool `json:"isInsertEnabled" validate:"required"` + IsUpdateEnabled bool `json:"isUpdateEnabled" validate:"required"` + IsDeleteEnabled bool `json:"isDeleteEnabled" validate:"required"` + IsApprovalEnabled bool `json:"isApprovalEnabled" validate:"required"` + IsAdminEnabled bool `json:"isAdminEnabled" validate:"required"` } func (req UserRoleAccessesUpdateRequest) ToEntity() *entity.UserRoleAccesses { diff --git a/app/module/user_role_accesses/response/user_role_accesses.response.go b/app/module/user_role_accesses/response/user_role_accesses.response.go index c9d0f70..74578dc 100644 --- a/app/module/user_role_accesses/response/user_role_accesses.response.go +++ b/app/module/user_role_accesses/response/user_role_accesses.response.go @@ -4,15 +4,15 @@ import "time" type UserRoleAccessesResponse struct { ID uint `json:"id"` - UserRoleId uint `json:"user_role_id"` - MenuId int `json:"menu_id"` - IsViewEnabled bool `json:"is_view_enabled"` - IsInsertEnabled bool `json:"is_insert_enabled"` - IsUpdateEnabled bool `json:"is_update_enabled"` - IsDeleteEnabled bool `json:"is_delete_enabled"` - IsApprovalEnabled bool `json:"is_approval_enabled"` - IsAdminEnabled bool `json:"is_admin_enabled"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + UserRoleId uint `json:"userRoleId"` + MenuId int `json:"menuId"` + IsViewEnabled bool `json:"isViewEnabled"` + IsInsertEnabled bool `json:"isInsertEnabled"` + IsUpdateEnabled bool `json:"isUpdateEnabled"` + IsDeleteEnabled bool `json:"isDeleteEnabled"` + IsApprovalEnabled bool `json:"isApprovalEnabled"` + IsAdminEnabled bool `json:"isAdminEnabled"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/user_role_level_details/request/user_role_level_details.request.go b/app/module/user_role_level_details/request/user_role_level_details.request.go index 580d238..7a749cd 100644 --- a/app/module/user_role_level_details/request/user_role_level_details.request.go +++ b/app/module/user_role_level_details/request/user_role_level_details.request.go @@ -11,15 +11,15 @@ type UserRoleLevelDetailsGeneric interface { } type UserRoleLevelDetailsQueryRequest struct { - UserRoleId uint `json:"user_role_id" validate:"required"` - UserLevelId uint `json:"user_level_id" validate:"required"` + UserRoleId uint `json:"userRoleId" validate:"required"` + UserLevelId uint `json:"userLevelId" validate:"required"` Pagination *paginator.Pagination `json:"pagination"` } type UserRoleLevelDetailsCreateRequest struct { - UserRoleId uint `json:"user_role_id" validate:"required"` - UserLevelId uint `json:"user_level_id" validate:"required"` - IsActive *bool `json:"is_active" validate:"required"` + UserRoleId uint `json:"userRoleId" validate:"required"` + UserLevelId uint `json:"userLevelId" validate:"required"` + IsActive *bool `json:"isActive" validate:"required"` } func (req UserRoleLevelDetailsCreateRequest) ToEntity() *entity.UserRoleLevelDetails { @@ -32,11 +32,11 @@ func (req UserRoleLevelDetailsCreateRequest) ToEntity() *entity.UserRoleLevelDet type UserRoleLevelDetailsUpdateRequest struct { ID uint `json:"id" validate:"required"` - UserRoleId uint `json:"user_role_id" validate:"required"` - UserLevelId uint `json:"user_level_id" validate:"required"` - IsActive *bool `json:"is_active" validate:"required"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + UserRoleId uint `json:"userRoleId" validate:"required"` + UserLevelId uint `json:"userLevelId" validate:"required"` + IsActive *bool `json:"isActive" validate:"required"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } func (req UserRoleLevelDetailsUpdateRequest) ToEntity() *entity.UserRoleLevelDetails { diff --git a/app/module/user_role_level_details/response/user_role_level_details.response.go b/app/module/user_role_level_details/response/user_role_level_details.response.go index 58ed186..ae7a1d0 100644 --- a/app/module/user_role_level_details/response/user_role_level_details.response.go +++ b/app/module/user_role_level_details/response/user_role_level_details.response.go @@ -4,9 +4,9 @@ import "time" type UserRoleLevelDetailsResponse struct { ID uint `json:"id"` - UserRoleId uint `json:"user_role_id"` - UserLevelId uint `json:"user_level_id"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + UserRoleId uint `json:"userRoleId"` + UserLevelId uint `json:"userLevelId"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/user_roles/request/user_roles.request.go b/app/module/user_roles/request/user_roles.request.go index 6ff92ac..8146080 100644 --- a/app/module/user_roles/request/user_roles.request.go +++ b/app/module/user_roles/request/user_roles.request.go @@ -43,9 +43,9 @@ type UserRolesUpdateRequest struct { Name string `json:"name" validate:"required"` Description string `json:"description" validate:"required"` Code string `json:"code" validate:"required"` - LevelNumber int `json:"level_number" validate:"required"` + LevelNumber int `json:"levelNumber" validate:"required"` UserLevelIds []uint `json:"userLevelIds" validate:"required"` - StatusId int `json:"status_id" validate:"required"` + StatusId int `json:"statusId" validate:"required"` } func (req UserRolesUpdateRequest) ToEntity() *entity.UserRoles { diff --git a/app/module/user_roles/response/user_roles.response.go b/app/module/user_roles/response/user_roles.response.go index 7747582..967c79d 100644 --- a/app/module/user_roles/response/user_roles.response.go +++ b/app/module/user_roles/response/user_roles.response.go @@ -7,10 +7,10 @@ type UserRolesResponse struct { Name string `json:"name"` Description string `json:"description"` Code string `json:"code"` - UserLevelId uint `json:"user_level_id"` - StatusId int `json:"status_id"` - CreatedById *uint `json:"created_by_id"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + UserLevelId uint `json:"userLevelId"` + StatusId int `json:"statusId"` + CreatedById *uint `json:"createdById"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/config/toml/config.toml b/config/toml/config.toml index 47d85fb..0df23f8 100644 --- a/config/toml/config.toml +++ b/config/toml/config.toml @@ -3,8 +3,8 @@ name = "Fiber starter" host = "http://38.47.180.165" port = ":8800" -domain = "https://dev.mikulnews.com/api" -external-port = ":8802" +domain = "https://narasiahli.com/api" +external-port = ":8801" idle-timeout = 5 # As seconds print-routes = false prefork = true @@ -12,7 +12,7 @@ production = false body-limit = 1048576000 # "100 * 1024 * 1024" [db.postgres] -dsn = "postgresql://medols_user:MedolsDB@2025@38.47.180.165:5432/medols_db" # ://:@:/ +dsn = "postgresql://narasiahli_user:NarasiAhliDB@2025@38.47.180.165:5432/narasiahli_db" # ://:@:/ log-mode = "NONE" migrate = true seed = true @@ -28,7 +28,7 @@ endpoint = "38.47.180.165:9009" access-key-id = "lBtjqWidHz1ktBbduwGy" secret-access-key = "nsedJIa2FI7SqsEVcSFqJrlP4JuFRWGLauNpzD0i" use-ssl = false -bucket-name = "mikulnews" +bucket-name = "narasiahli" location = "us-east-1" [middleware.compress] @@ -67,9 +67,9 @@ retention = 30 [keycloak] endpoint = "http://38.47.180.165:8008" -realm = "medols" -client-id = "medols-app" -client-secret = "iyonEpZbAUs20quwaNFLMwRX7MUgPRlS" +realm = "narasi-ahli" +client-id = "narasi-ahli-app" +client-secret = "IoU4CkzWkWmg6PrC2Ruh8d76QArb0UzJ" admin-username = "developer-admin" admin-password = "P@ssw0rd.1"