diff --git a/kontor-gin/internal/models/media_actor.go b/kontor-gin/internal/models/media_actor.go index 2250904..230180f 100644 --- a/kontor-gin/internal/models/media_actor.go +++ b/kontor-gin/internal/models/media_actor.go @@ -1,6 +1,9 @@ package models -import "time" +import ( + "kontor-api-gin/internal/helpers" + "time" +) type MediaActor struct { ID string `gorm:"type:string;primary_key;" json:"id"` @@ -19,13 +22,13 @@ func (media_actor *MediaActor) TableName() string { } type MediaActorDTO struct { - ID string `json:"id" binding:"required"` - CreatedAt time.Time `json:"created_date"` - UpdatedAt time.Time `json:"last_modified_date"` - DeletedAt *time.Time `json:"deleted_date,omitempty"` - Version int `json:"version"` - Name string `json:"name"` - WebLink string `json:"url"` + ID string `json:"id" binding:"required"` + CreatedAt helpers.KontorTime `json:"created_date"` + UpdatedAt helpers.KontorTime `json:"last_modified_date"` + DeletedAt *time.Time `json:"deleted_date,omitempty"` + Version int `json:"version"` + Name string `json:"name"` + WebLink string `json:"url"` } func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO { @@ -33,8 +36,8 @@ func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO { for i, actor := range actors { dtos[i] = MediaActorDTO{ ID: actor.ID, - CreatedAt: actor.CreatedAt, - UpdatedAt: actor.UpdatedAt, + CreatedAt: helpers.KontorTime{Time: actor.CreatedAt}, + UpdatedAt: helpers.KontorTime{Time: actor.UpdatedAt}, DeletedAt: actor.DeletedAt, Version: actor.Version, Name: actor.Name, diff --git a/kontor-gin/internal/models/media_actor_file.go b/kontor-gin/internal/models/media_actor_file.go index 8d6d381..94e9887 100644 --- a/kontor-gin/internal/models/media_actor_file.go +++ b/kontor-gin/internal/models/media_actor_file.go @@ -1,6 +1,9 @@ package models -import "time" +import ( + "kontor-api-gin/internal/helpers" + "time" +) type MediaActorFile struct { ID string `gorm:"type:string;primary_key;" json:"id"` @@ -19,13 +22,13 @@ func (media_file *MediaActorFile) TableName() string { } type MediaActorFileDTO struct { - ID string `json:"id" binding:"required"` - CreatedAt time.Time `json:"created_date"` - UpdatedAt time.Time `json:"last_modified_date"` - DeletedAt *time.Time `json:"deleted_date"` - Version int `json:"version"` - MediaActorID *string `json:"media_actor_id"` - MediaFileID *string `json:"media_file_id"` + ID string `json:"id" binding:"required"` + CreatedAt helpers.KontorTime `json:"created_date"` + UpdatedAt helpers.KontorTime `json:"last_modified_date"` + DeletedAt *time.Time `json:"deleted_date,omitempty"` + Version int `json:"version"` + MediaActorID *string `json:"media_actor_id"` + MediaFileID *string `json:"media_file_id"` } func ConvertMediaActorFilesToDtos(actor_files []MediaActorFile) []MediaActorFileDTO { @@ -33,8 +36,8 @@ func ConvertMediaActorFilesToDtos(actor_files []MediaActorFile) []MediaActorFile for i, actor_file := range actor_files { dtos[i] = MediaActorFileDTO{ ID: actor_file.ID, - CreatedAt: actor_file.CreatedAt, - UpdatedAt: actor_file.UpdatedAt, + CreatedAt: helpers.KontorTime{Time: actor_file.CreatedAt}, + UpdatedAt: helpers.KontorTime{Time: actor_file.UpdatedAt}, DeletedAt: actor_file.DeletedAt, Version: actor_file.Version, MediaActorID: actor_file.MediaActorID,