diff --git a/app/database/entity/campaign_destinations.entity.go b/app/database/entity/campaign_destinations.entity.go index e4e27bb..70ffd3d 100644 --- a/app/database/entity/campaign_destinations.entity.go +++ b/app/database/entity/campaign_destinations.entity.go @@ -9,8 +9,8 @@ type CampaignDestinations struct { ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"` CampaignTypeID uint `json:"campaign_type_id" gorm:"type:int4"` CampaignType CampaignTypes `json:"campaign_type" gorm:"foreignKey:CampaignTypeID;references:ID"` - SubType string `json:"sub_type" gorm:"type:varchar(100)"` Name string `json:"name" gorm:"type:varchar(150)"` + SubType *string `json:"sub_type" gorm:"type:varchar(100)"` Description *string `json:"description" gorm:"type:text"` URL *string `json:"url" gorm:"type:varchar(255)"` IsActive *bool `json:"is_active" gorm:"type:bool;default:true"` diff --git a/app/module/campaign_destinations/request/campaign_destinations.request.go b/app/module/campaign_destinations/request/campaign_destinations.request.go index 0a0de63..8b1b6fd 100644 --- a/app/module/campaign_destinations/request/campaign_destinations.request.go +++ b/app/module/campaign_destinations/request/campaign_destinations.request.go @@ -8,16 +8,16 @@ import ( ) type CampaignDestinationsQueryRequest struct { - Name *string `json:"name"` - CampaignTypeID *uint `json:"campaignTypeId"` - IsActive *bool `json:"isActive"` - Pagination *paginator.Pagination `json:"pagination"` + Name *string `json:"name"` + CampaignTypeID *uint `json:"campaignTypeId"` + IsActive *bool `json:"isActive"` + Pagination *paginator.Pagination `json:"pagination"` } type CampaignDestinationsCreateRequest struct { - CampaignTypeID uint `json:"campaign_type_id" validate:"required"` - SubType string `json:"sub_type" validate:"required"` + CampaignTypeID uint `json:"campaignTypeId" validate:"required"` Name string `json:"name" validate:"required"` + SubType *string `json:"subType"` Description *string `json:"description"` URL *string `json:"url"` IsActive *bool `json:"isActive"` @@ -42,9 +42,9 @@ func (req CampaignDestinationsCreateRequest) ToEntity() *entity.CampaignDestinat } type CampaignDestinationsUpdateRequest struct { - CampaignTypeID uint `json:"campaign_type_id" validate:"required"` - SubType string `json:"sub_type" validate:"required"` + CampaignTypeID uint `json:"campaignTypeId" validate:"required"` Name string `json:"name" validate:"required"` + SubType *string `json:"subType"` Description *string `json:"description"` URL *string `json:"url"` IsActive *bool `json:"isActive"` @@ -90,4 +90,3 @@ func (req CampaignDestinationsQueryRequestContext) ToParamRequest() CampaignDest return request } - diff --git a/app/module/campaign_destinations/response/campaign_destinations.response.go b/app/module/campaign_destinations/response/campaign_destinations.response.go index 9d3f3f4..8dce08d 100644 --- a/app/module/campaign_destinations/response/campaign_destinations.response.go +++ b/app/module/campaign_destinations/response/campaign_destinations.response.go @@ -4,15 +4,15 @@ import "time" type CampaignDestinationsResponse struct { ID uint `json:"id"` - CampaignTypeID uint `json:"campaign_type_id"` - CampaignType *CampaignTypeInfo `json:"campaign_type,omitempty"` - SubType string `json:"sub_type"` + CampaignTypeID uint `json:"campaignTypeId"` + CampaignType *CampaignTypeInfo `json:"campaignType,omitempty"` + SubType *string `json:"subType"` Name string `json:"name"` Description *string `json:"description"` URL *string `json:"url"` - IsActive *bool `json:"is_active"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } type CampaignTypeInfo struct { diff --git a/app/module/campaign_files/mapper/campaign_files.mapper.go b/app/module/campaign_files/mapper/campaign_files.mapper.go index 8553f49..411c5dd 100644 --- a/app/module/campaign_files/mapper/campaign_files.mapper.go +++ b/app/module/campaign_files/mapper/campaign_files.mapper.go @@ -15,6 +15,7 @@ func CampaignFilesResponseMapper(campaignFilesReq *entity.CampaignFiles) (campai ExternalURL: campaignFilesReq.ExternalURL, IsDraft: campaignFilesReq.IsDraft, IsPublish: campaignFilesReq.IsPublish, + IsActive: campaignFilesReq.IsActive, CreatedAt: campaignFilesReq.CreatedAt, UpdatedAt: campaignFilesReq.UpdatedAt, } diff --git a/app/module/campaign_files/request/campaign_files.request.go b/app/module/campaign_files/request/campaign_files.request.go index ea43142..2e597a9 100644 --- a/app/module/campaign_files/request/campaign_files.request.go +++ b/app/module/campaign_files/request/campaign_files.request.go @@ -14,12 +14,12 @@ type CampaignFilesQueryRequest struct { } type CampaignFilesCreateRequest struct { - CampaignID uint `json:"campaign_id" validate:"required"` + CampaignID uint `json:"campaignId" validate:"required"` Type string `json:"type" validate:"required"` // url, file - FileURL *string `json:"file_url"` - ExternalURL *string `json:"external_url"` - IsDraft *bool `json:"is_draft"` - IsPublish *bool `json:"is_publish"` + FileURL *string `json:"fileUrl"` + ExternalURL *string `json:"externalUrl"` + IsDraft *bool `json:"isDraft"` + IsPublish *bool `json:"isPublish"` } func (req CampaignFilesCreateRequest) ToEntity() *entity.CampaignFiles { @@ -45,10 +45,10 @@ func (req CampaignFilesCreateRequest) ToEntity() *entity.CampaignFiles { type CampaignFilesUpdateRequest struct { Type string `json:"type" validate:"required"` - FileURL *string `json:"file_url"` - ExternalURL *string `json:"external_url"` - IsDraft *bool `json:"is_draft"` - IsPublish *bool `json:"is_publish"` + FileURL *string `json:"fileUrl"` + ExternalURL *string `json:"externalUrl"` + IsDraft *bool `json:"isDraft"` + IsPublish *bool `json:"isPublish"` } func (req CampaignFilesUpdateRequest) ToEntity() *entity.CampaignFiles { diff --git a/app/module/campaign_files/response/campaign_files.response.go b/app/module/campaign_files/response/campaign_files.response.go index a0c922d..53a541b 100644 --- a/app/module/campaign_files/response/campaign_files.response.go +++ b/app/module/campaign_files/response/campaign_files.response.go @@ -4,13 +4,14 @@ import "time" type CampaignFilesResponse struct { ID uint `json:"id"` - CampaignID uint `json:"campaign_id"` + CampaignID uint `json:"campaignId"` Type string `json:"type"` - FileURL *string `json:"file_url"` - ExternalURL *string `json:"external_url"` - IsDraft *bool `json:"is_draft"` - IsPublish *bool `json:"is_publish"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + FileURL *string `json:"fileUrl"` + ExternalURL *string `json:"externalUrl"` + IsDraft *bool `json:"isDraft"` + IsPublish *bool `json:"isPublish"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/campaign_types/mapper/campaign_types.mapper.go b/app/module/campaign_types/mapper/campaign_types.mapper.go index f406640..63055af 100644 --- a/app/module/campaign_types/mapper/campaign_types.mapper.go +++ b/app/module/campaign_types/mapper/campaign_types.mapper.go @@ -11,6 +11,7 @@ func CampaignTypesResponseMapper(campaignTypesReq *entity.CampaignTypes) (campai ID: campaignTypesReq.ID, Name: campaignTypesReq.Name, Description: campaignTypesReq.Description, + IsActive: campaignTypesReq.IsActive, CreatedAt: campaignTypesReq.CreatedAt, UpdatedAt: campaignTypesReq.UpdatedAt, } diff --git a/app/module/campaign_types/response/campaign_types.response.go b/app/module/campaign_types/response/campaign_types.response.go index ab95fec..2addfca 100644 --- a/app/module/campaign_types/response/campaign_types.response.go +++ b/app/module/campaign_types/response/campaign_types.response.go @@ -6,6 +6,7 @@ type CampaignTypesResponse struct { ID uint `json:"id"` Name string `json:"name"` Description *string `json:"description"` + IsActive *bool `json:"isActive"` CreatedAt time.Time `json:"createdAt"` UpdatedAt time.Time `json:"updatedAt"` } diff --git a/app/module/campaigns/mapper/campaigns.mapper.go b/app/module/campaigns/mapper/campaigns.mapper.go index 1cf9ca6..9c7b53e 100644 --- a/app/module/campaigns/mapper/campaigns.mapper.go +++ b/app/module/campaigns/mapper/campaigns.mapper.go @@ -20,6 +20,7 @@ func CampaignsResponseMapper(campaignsReq *entity.Campaigns, host string) (campa Description: campaignsReq.Description, CreatorID: campaignsReq.CreatorID, Status: campaignsReq.Status, + IsActive: campaignsReq.IsActive, CreatedAt: campaignsReq.CreatedAt, UpdatedAt: campaignsReq.UpdatedAt, } diff --git a/app/module/campaigns/request/campaigns.request.go b/app/module/campaigns/request/campaigns.request.go index 91e6070..ce557e1 100644 --- a/app/module/campaigns/request/campaigns.request.go +++ b/app/module/campaigns/request/campaigns.request.go @@ -17,15 +17,15 @@ type CampaignsQueryRequest struct { type CampaignsCreateRequest struct { Title string `json:"title" validate:"required"` - CampaignTypeID uint `json:"campaign_type_id" validate:"required"` - StartDate *string `json:"start_date"` - EndDate *string `json:"end_date"` - MediaTypeSelected *string `json:"media_type_selected"` - MediaItemSelected *string `json:"media_item_selected"` + CampaignTypeID uint `json:"campaignTypeId" validate:"required"` + StartDate *string `json:"startDate"` + EndDate *string `json:"endDate"` + MediaTypeSelected *string `json:"mediaTypeSelected"` + MediaItemSelected *string `json:"mediaItemSelected"` Purpose *string `json:"purpose"` - MediaPromote *bool `json:"media_promote"` + MediaPromote *bool `json:"mediaPromote"` Description *string `json:"description"` - CreatorID *uint `json:"creator_id"` + CreatorID *uint `json:"creatorId"` Status *string `json:"status"` } @@ -63,13 +63,13 @@ func (req CampaignsCreateRequest) ToEntity() *entity.Campaigns { type CampaignsUpdateRequest struct { Title string `json:"title" validate:"required"` - CampaignTypeID uint `json:"campaign_type_id" validate:"required"` - StartDate *string `json:"start_date"` - EndDate *string `json:"end_date"` - MediaTypeSelected *string `json:"media_type_selected"` - MediaItemSelected *string `json:"media_item_selected"` + CampaignTypeID uint `json:"campaignTypeId" validate:"required"` + StartDate *string `json:"startDate"` + EndDate *string `json:"endDate"` + MediaTypeSelected *string `json:"mediaTypeSelected"` + MediaItemSelected *string `json:"mediaItemSelected"` Purpose *string `json:"purpose"` - MediaPromote *bool `json:"media_promote"` + MediaPromote *bool `json:"mediaPromote"` Description *string `json:"description"` Status *string `json:"status"` } diff --git a/app/module/campaigns/response/campaigns.response.go b/app/module/campaigns/response/campaigns.response.go index 8067447..026907a 100644 --- a/app/module/campaigns/response/campaigns.response.go +++ b/app/module/campaigns/response/campaigns.response.go @@ -5,20 +5,21 @@ import "time" type CampaignsResponse struct { ID uint `json:"id"` Title string `json:"title"` - CampaignTypeID uint `json:"campaign_type_id"` - CampaignType *CampaignTypeInfo `json:"campaign_type,omitempty"` - StartDate *time.Time `json:"start_date"` - EndDate *time.Time `json:"end_date"` - MediaTypeSelected *string `json:"media_type_selected"` - MediaItemSelected *string `json:"media_item_selected"` + CampaignTypeID uint `json:"campaignTypeId"` + CampaignType *CampaignTypeInfo `json:"campaignType,omitempty"` + StartDate *time.Time `json:"startDate"` + EndDate *time.Time `json:"endDate"` + MediaTypeSelected *string `json:"mediaTypeSelected"` + MediaItemSelected *string `json:"mediaItemSelected"` Purpose *string `json:"purpose"` - MediaPromote *bool `json:"media_promote"` + MediaPromote *bool `json:"mediaPromote"` Description *string `json:"description"` - CreatorID uint `json:"creator_id"` + CreatorID uint `json:"creatorId"` Creator *CreatorInfo `json:"creator,omitempty"` Status string `json:"status"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + IsActive *bool `json:"isActive"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` } type CampaignTypeInfo struct { diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go index c5573a5..892b020 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -16533,12 +16533,11 @@ const docTemplate = `{ "request.CampaignDestinationsCreateRequest": { "type": "object", "required": [ - "campaign_type_id", - "name", - "sub_type" + "campaignTypeId", + "name" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "createdById": { @@ -16553,7 +16552,7 @@ const docTemplate = `{ "name": { "type": "string" }, - "sub_type": { + "subType": { "type": "string" }, "url": { @@ -16564,12 +16563,11 @@ const docTemplate = `{ "request.CampaignDestinationsUpdateRequest": { "type": "object", "required": [ - "campaign_type_id", - "name", - "sub_type" + "campaignTypeId", + "name" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "description": { @@ -16581,7 +16579,7 @@ const docTemplate = `{ "name": { "type": "string" }, - "sub_type": { + "subType": { "type": "string" }, "url": { @@ -16623,35 +16621,35 @@ const docTemplate = `{ "request.CampaignsCreateRequest": { "type": "object", "required": [ - "campaign_type_id", + "campaignTypeId", "title" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, - "creator_id": { + "creatorId": { "type": "integer" }, "description": { "type": "string" }, - "end_date": { + "endDate": { "type": "string" }, - "media_item_selected": { + "mediaItemSelected": { "type": "string" }, - "media_promote": { + "mediaPromote": { "type": "boolean" }, - "media_type_selected": { + "mediaTypeSelected": { "type": "string" }, "purpose": { "type": "string" }, - "start_date": { + "startDate": { "type": "string" }, "status": { @@ -16665,32 +16663,32 @@ const docTemplate = `{ "request.CampaignsUpdateRequest": { "type": "object", "required": [ - "campaign_type_id", + "campaignTypeId", "title" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "description": { "type": "string" }, - "end_date": { + "endDate": { "type": "string" }, - "media_item_selected": { + "mediaItemSelected": { "type": "string" }, - "media_promote": { + "mediaPromote": { "type": "boolean" }, - "media_type_selected": { + "mediaTypeSelected": { "type": "string" }, "purpose": { "type": "string" }, - "start_date": { + "startDate": { "type": "string" }, "status": { diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index d8d9caf..c551734 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -16522,12 +16522,11 @@ "request.CampaignDestinationsCreateRequest": { "type": "object", "required": [ - "campaign_type_id", - "name", - "sub_type" + "campaignTypeId", + "name" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "createdById": { @@ -16542,7 +16541,7 @@ "name": { "type": "string" }, - "sub_type": { + "subType": { "type": "string" }, "url": { @@ -16553,12 +16552,11 @@ "request.CampaignDestinationsUpdateRequest": { "type": "object", "required": [ - "campaign_type_id", - "name", - "sub_type" + "campaignTypeId", + "name" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "description": { @@ -16570,7 +16568,7 @@ "name": { "type": "string" }, - "sub_type": { + "subType": { "type": "string" }, "url": { @@ -16612,35 +16610,35 @@ "request.CampaignsCreateRequest": { "type": "object", "required": [ - "campaign_type_id", + "campaignTypeId", "title" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, - "creator_id": { + "creatorId": { "type": "integer" }, "description": { "type": "string" }, - "end_date": { + "endDate": { "type": "string" }, - "media_item_selected": { + "mediaItemSelected": { "type": "string" }, - "media_promote": { + "mediaPromote": { "type": "boolean" }, - "media_type_selected": { + "mediaTypeSelected": { "type": "string" }, "purpose": { "type": "string" }, - "start_date": { + "startDate": { "type": "string" }, "status": { @@ -16654,32 +16652,32 @@ "request.CampaignsUpdateRequest": { "type": "object", "required": [ - "campaign_type_id", + "campaignTypeId", "title" ], "properties": { - "campaign_type_id": { + "campaignTypeId": { "type": "integer" }, "description": { "type": "string" }, - "end_date": { + "endDate": { "type": "string" }, - "media_item_selected": { + "mediaItemSelected": { "type": "string" }, - "media_promote": { + "mediaPromote": { "type": "boolean" }, - "media_type_selected": { + "mediaTypeSelected": { "type": "string" }, "purpose": { "type": "string" }, - "start_date": { + "startDate": { "type": "string" }, "status": { diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index e6e2236..e320f75 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -380,7 +380,7 @@ definitions: type: object request.CampaignDestinationsCreateRequest: properties: - campaign_type_id: + campaignTypeId: type: integer createdById: type: integer @@ -390,18 +390,17 @@ definitions: type: boolean name: type: string - sub_type: + subType: type: string url: type: string required: - - campaign_type_id + - campaignTypeId - name - - sub_type type: object request.CampaignDestinationsUpdateRequest: properties: - campaign_type_id: + campaignTypeId: type: integer description: type: string @@ -409,14 +408,13 @@ definitions: type: boolean name: type: string - sub_type: + subType: type: string url: type: string required: - - campaign_type_id + - campaignTypeId - name - - sub_type type: object request.CampaignTypesCreateRequest: properties: @@ -440,56 +438,56 @@ definitions: type: object request.CampaignsCreateRequest: properties: - campaign_type_id: + campaignTypeId: type: integer - creator_id: + creatorId: type: integer description: type: string - end_date: + endDate: type: string - media_item_selected: + mediaItemSelected: type: string - media_promote: + mediaPromote: type: boolean - media_type_selected: + mediaTypeSelected: type: string purpose: type: string - start_date: + startDate: type: string status: type: string title: type: string required: - - campaign_type_id + - campaignTypeId - title type: object request.CampaignsUpdateRequest: properties: - campaign_type_id: + campaignTypeId: type: integer description: type: string - end_date: + endDate: type: string - media_item_selected: + mediaItemSelected: type: string - media_promote: + mediaPromote: type: boolean - media_type_selected: + mediaTypeSelected: type: string purpose: type: string - start_date: + startDate: type: string status: type: string title: type: string required: - - campaign_type_id + - campaignTypeId - title type: object request.ChatMessageCreateRequest: