alex/mysubaru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor JSON unmarshalling in CustomTime types to simplify quote handling and improve null value checks
All checks were successful
Golan Testing / testing (1.24.x, ubuntu-latest) (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Alex Savin
2025-07-08 22:38:09 -04:00
parent c018850e34
commit 7f5b092c64
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysubaru.go
View File

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"log/slog" "log/slog"
"strings"
"time" "time"
) )
@ -497,12 +496,12 @@ type CustomTime1 struct {
func (ct *CustomTime1) UnmarshalJSON(b []byte) (err error) { func (ct *CustomTime1) UnmarshalJSON(b []byte) (err error) {
// Use the correct layout string for the desired format // Use the correct layout string for the desired format
const layout = "2006-01-02T15:04:05" const layout = "2006-01-02T15:04:05"
s := strings.Trim(string(b), "\\\"") // Remove surrounding quotes // s := strings.Trim(string(b), "\\\"") // Remove surrounding quotes
if s == "null" { if string(b) == "null" {
ct.Time = time.Time{} ct.Time = time.Time{}
return nil return nil
} }
ct.Time, err = time.Parse(layout, string(b)) ct.Time, err = time.Parse(layout, string(b)) // Parse the string with your custom layout
return return
} }
@ -515,11 +514,11 @@ type CustomTime2 struct {
func (ct *CustomTime2) UnmarshalJSON(b []byte) (err error) { func (ct *CustomTime2) UnmarshalJSON(b []byte) (err error) {
// Use the correct layout string for the desired format // Use the correct layout string for the desired format
const layout = "2006-01-02T15:04:05-0700" const layout = "2006-01-02T15:04:05-0700"
s := strings.Trim(string(b), "\\\"") // Remove surrounding quotes // s := strings.Trim(string(b), "\\\"") // Remove surrounding quotes
if s == "null" { if string(b) == "null" {
ct.Time = time.Time{} ct.Time = time.Time{}
return nil return nil
} }
ct.Time, err = time.Parse(layout, s) // Parse the string with your custom layout ct.Time, err = time.Parse(layout, string(b)) // Parse the string with your custom layout
return return
} }