omit empty deleted dates
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 4s

This commit is contained in:
2026-10-04 21:25:47 +02:00
parent 8c9850d4b1
commit 56d2434097
2 changed files with 26 additions and 20 deletions
+13 -10
View File
@@ -1,6 +1,9 @@
package models package models
import "time" import (
"kontor-api-gin/internal/helpers"
"time"
)
type MediaActor struct { type MediaActor struct {
ID string `gorm:"type:string;primary_key;" json:"id"` ID string `gorm:"type:string;primary_key;" json:"id"`
@@ -19,13 +22,13 @@ func (media_actor *MediaActor) TableName() string {
} }
type MediaActorDTO struct { type MediaActorDTO struct {
ID string `json:"id" binding:"required"` ID string `json:"id" binding:"required"`
CreatedAt time.Time `json:"created_date"` CreatedAt helpers.KontorTime `json:"created_date"`
UpdatedAt time.Time `json:"last_modified_date"` UpdatedAt helpers.KontorTime `json:"last_modified_date"`
DeletedAt *time.Time `json:"deleted_date,omitempty"` DeletedAt *time.Time `json:"deleted_date,omitempty"`
Version int `json:"version"` Version int `json:"version"`
Name string `json:"name"` Name string `json:"name"`
WebLink string `json:"url"` WebLink string `json:"url"`
} }
func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO { func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO {
@@ -33,8 +36,8 @@ func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO {
for i, actor := range actors { for i, actor := range actors {
dtos[i] = MediaActorDTO{ dtos[i] = MediaActorDTO{
ID: actor.ID, ID: actor.ID,
CreatedAt: actor.CreatedAt, CreatedAt: helpers.KontorTime{Time: actor.CreatedAt},
UpdatedAt: actor.UpdatedAt, UpdatedAt: helpers.KontorTime{Time: actor.UpdatedAt},
DeletedAt: actor.DeletedAt, DeletedAt: actor.DeletedAt,
Version: actor.Version, Version: actor.Version,
Name: actor.Name, Name: actor.Name,
+13 -10
View File
@@ -1,6 +1,9 @@
package models package models
import "time" import (
"kontor-api-gin/internal/helpers"
"time"
)
type MediaActorFile struct { type MediaActorFile struct {
ID string `gorm:"type:string;primary_key;" json:"id"` ID string `gorm:"type:string;primary_key;" json:"id"`
@@ -19,13 +22,13 @@ func (media_file *MediaActorFile) TableName() string {
} }
type MediaActorFileDTO struct { type MediaActorFileDTO struct {
ID string `json:"id" binding:"required"` ID string `json:"id" binding:"required"`
CreatedAt time.Time `json:"created_date"` CreatedAt helpers.KontorTime `json:"created_date"`
UpdatedAt time.Time `json:"last_modified_date"` UpdatedAt helpers.KontorTime `json:"last_modified_date"`
DeletedAt *time.Time `json:"deleted_date"` DeletedAt *time.Time `json:"deleted_date,omitempty"`
Version int `json:"version"` Version int `json:"version"`
MediaActorID *string `json:"media_actor_id"` MediaActorID *string `json:"media_actor_id"`
MediaFileID *string `json:"media_file_id"` MediaFileID *string `json:"media_file_id"`
} }
func ConvertMediaActorFilesToDtos(actor_files []MediaActorFile) []MediaActorFileDTO { func ConvertMediaActorFilesToDtos(actor_files []MediaActorFile) []MediaActorFileDTO {
@@ -33,8 +36,8 @@ func ConvertMediaActorFilesToDtos(actor_files []MediaActorFile) []MediaActorFile
for i, actor_file := range actor_files { for i, actor_file := range actor_files {
dtos[i] = MediaActorFileDTO{ dtos[i] = MediaActorFileDTO{
ID: actor_file.ID, ID: actor_file.ID,
CreatedAt: actor_file.CreatedAt, CreatedAt: helpers.KontorTime{Time: actor_file.CreatedAt},
UpdatedAt: actor_file.UpdatedAt, UpdatedAt: helpers.KontorTime{Time: actor_file.UpdatedAt},
DeletedAt: actor_file.DeletedAt, DeletedAt: actor_file.DeletedAt,
Version: actor_file.Version, Version: actor_file.Version,
MediaActorID: actor_file.MediaActorID, MediaActorID: actor_file.MediaActorID,