From e6d15ac9506cdc129c13607e27f04ae1ad96d149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sun, 11 Jun 2023 07:40:30 +0200 Subject: [PATCH] refactor: bun - remove no longer needed struct tags --- internal/bundb/internal/model/group.go | 18 +++++++++--------- internal/bundb/internal/model/monitor.go | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/bundb/internal/model/group.go b/internal/bundb/internal/model/group.go index ca02388..11b84d6 100644 --- a/internal/bundb/internal/model/group.go +++ b/internal/bundb/internal/model/group.go @@ -11,15 +11,15 @@ import ( type Group struct { bun.BaseModel `bun:"base_model,table:groups,alias:group"` - ID uuid.UUID `bun:"id,type:uuid,pk,default:gen_random_uuid()"` - ServerID string `bun:"server_id,type:varchar(100),notnull"` - ChannelGains string `bun:"channel_gains,type:varchar(100),nullzero"` - ChannelLosses string `bun:"channel_losses,type:varchar(100),nullzero"` - Internals bool `bun:"internals,default:false"` - Barbarians bool `bun:"barbarians,default:false"` - ServerKey string `bun:"server_key,type:varchar(50),notnull"` - VersionCode string `bun:"version_code,type:varchar(6),notnull"` - CreatedAt time.Time `bun:"created_at,nullzero,notnull,default:current_timestamp"` + ID uuid.UUID `bun:"id,pk,nullzero"` + ServerID string `bun:"server_id,nullzero"` + ChannelGains string `bun:"channel_gains,nullzero"` + ChannelLosses string `bun:"channel_losses,nullzero"` + Internals bool `bun:"internals"` + Barbarians bool `bun:"barbarians"` + ServerKey string `bun:"server_key,nullzero"` + VersionCode string `bun:"version_code,nullzero"` + CreatedAt time.Time `bun:"created_at,nullzero"` } func (g Group) ToDomain() domain.Group { diff --git a/internal/bundb/internal/model/monitor.go b/internal/bundb/internal/model/monitor.go index cf2d82e..9cfeed2 100644 --- a/internal/bundb/internal/model/monitor.go +++ b/internal/bundb/internal/model/monitor.go @@ -11,10 +11,10 @@ import ( type Monitor struct { bun.BaseModel `bun:"base_model,table:monitors,alias:monitor"` - ID uuid.UUID `bun:"id,type:uuid,pk,default:gen_random_uuid()"` - GroupID uuid.UUID `bun:"group_id,type:uuid,notnull,unique:monitors_group_id_tribe_id_key"` - TribeID int64 `bun:"tribe_id,notnull,unique:monitors_group_id_tribe_id_key"` - CreatedAt time.Time `bun:"created_at,nullzero,notnull,default:current_timestamp"` + ID uuid.UUID `bun:"id,pk,nullzero"` + GroupID uuid.UUID `bun:"group_id"` + TribeID int64 `bun:"tribe_id,nullzero"` + CreatedAt time.Time `bun:"created_at,nullzero"` } func (m Monitor) ToDomain() domain.Monitor {