H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(backend/domain): get rid of pgx types

Browse Source
This commit is contained in:
Masahiko AMANO 2025-10-09 01:45:43 +03:00
parent 00ab98072b
commit bc4354bf7b
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/internal/domain/entity.go
View File

@ -3,8 +3,6 @@ package domain
import ( import (
"encoding/json" "encoding/json"
"time" "time"
"github.com/jackc/pgx/v5/pgtype"
) )
type User struct { type User struct {
@ -31,14 +29,14 @@ type (
CategoryCore CategoryCore
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Creator User `json:"creator"` Creator User `json:"creator"`
Notes pgtype.Text `json:"notes"` Notes *string `json:"notes"`
} }
) )
type ( type (
FileCore struct { FileCore struct {
ID string `json:"id"` ID string `json:"id"`
Name pgtype.Text `json:"name"` Name *string `json:"name"`
MIME MIME `json:"mime"` MIME MIME `json:"mime"`
} }
FileItem struct { FileItem struct {
@ -50,7 +48,7 @@ type (
FileCore FileCore
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Creator User `json:"creator"` Creator User `json:"creator"`
Notes pgtype.Text `json:"notes"` Notes *string `json:"notes"`
Metadata json.RawMessage `json:"metadata"` Metadata json.RawMessage `json:"metadata"`
Viewed int `json:"viewed"` Viewed int `json:"viewed"`
} }
@ -60,7 +58,7 @@ type (
TagCore struct { TagCore struct {
ID string `json:"id"` ID string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Color pgtype.Text `json:"color"` Color *string `json:"color"`
} }
TagItem struct { TagItem struct {
TagCore TagCore
@ -71,7 +69,7 @@ type (
Category CategoryCore `json:"category"` Category CategoryCore `json:"category"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Creator User `json:"creator"` Creator User `json:"creator"`
Notes pgtype.Text `json:"notes"` Notes *string `json:"notes"`
UsedIncl int `json:"usedIncl"` UsedIncl int `json:"usedIncl"`
UsedExcl int `json:"usedExcl"` UsedExcl int `json:"usedExcl"`
} }
@ -95,7 +93,7 @@ type (
PoolCore PoolCore
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Creator User `json:"creator"` Creator User `json:"creator"`
Notes pgtype.Text `json:"notes"` Notes *string `json:"notes"`
Viewed int `json:"viewed"` Viewed int `json:"viewed"`
} }
) )

3
backend/internal/infrastructure/persistence/postgres/file_repository.go
View File

@ -198,8 +198,7 @@ func (s *FileRepository) Add(ctx context.Context, user_id int, name, mime string
domainErr = domain.NewUnexpectedError(err) domainErr = domain.NewUnexpectedError(err)
return return
} }
file.Name.String = name file.Name = &name
file.Name.Valid = (name != "")
file.MIME.Name = mime file.MIME.Name = mime
file.MIME.Extension = extension file.MIME.Extension = extension
return return