diff options
| author | leshe4ka46 <alex9102naid1@ya.ru> | 2025-10-11 20:26:19 +0300 |
|---|---|---|
| committer | leshe4ka46 <alex9102naid1@ya.ru> | 2025-10-11 20:26:19 +0300 |
| commit | 5495a01c7ec3ca63202abbc90eefe31ca88310e5 (patch) | |
| tree | 16ffc623d0df77105dc053f988502bf663e2b026 /pkg | |
| parent | 2d35000b41e5ccb63a42eee24c4de063efd9071e (diff) | |
small fixes
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapters/json/json.go | 2 | ||||
| -rw-r--r-- | pkg/adapters/json/model.go | 7 | ||||
| -rw-r--r-- | pkg/model/user.go | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/pkg/adapters/json/json.go b/pkg/adapters/json/json.go index 8da149e..c0ea4e4 100644 --- a/pkg/adapters/json/json.go +++ b/pkg/adapters/json/json.go @@ -40,8 +40,6 @@ func (d *DateYMD) UnmarshalJSON(b []byte) error { return nil } -/*----- Trimmed string (for loyalty Number: " 889..." ) -----*/ - type Trimmed string func (t *Trimmed) UnmarshalJSON(b []byte) error { diff --git a/pkg/adapters/json/model.go b/pkg/adapters/json/model.go index a010367..2a91f21 100644 --- a/pkg/adapters/json/model.go +++ b/pkg/adapters/json/model.go @@ -8,8 +8,6 @@ import ( "airlines/pkg/model" ) -/* ---------- helpers ---------- */ - func sOrEmpty(p *string) string { if p == nil { return "" @@ -17,7 +15,7 @@ func sOrEmpty(p *string) string { return *p } -func toDateUTC(d DateYMD) time.Time { +func (d DateYMD) ToDateUTC() time.Time { if !d.Valid { return time.Time{} } @@ -46,7 +44,6 @@ func (jp JsonProfile) ToUser() *model.User { } func (jf JsonFlight) ToFlight() *model.Flight { - d := toDateUTC(jf.Date) return &model.Flight{ Number: jf.Flight, From: jf.Departure.Airport, @@ -55,7 +52,7 @@ func (jf JsonFlight) ToFlight() *model.Flight { To: jf.Arrival.Airport, ToCity: jf.Arrival.City, ToCountry: jf.Arrival.Country, - Date: d, + Date: jf.Date.ToDateUTC(), } } diff --git a/pkg/model/user.go b/pkg/model/user.go index 85117f6..bfa3694 100644 --- a/pkg/model/user.go +++ b/pkg/model/user.go @@ -6,7 +6,7 @@ import ( "time" ) -const sentinelYear = 1000 +const sentinelYear = 1 func SentinelBirthday() time.Time { return time.Date(sentinelYear, 1, 1, 0, 0, 0, 0, time.UTC) |
