From 6613a2145fd49f0cf03b48e2f0daf356ac89814c Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Wed, 12 Feb 2025 15:17:19 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20HoursMin?= =?UTF-8?q?utesSeconds{}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendar/calendar.go | 4 ++-- calendar/calendar_test.go | 2 +- micro/microfunctions.go | 4 ++-- micro/microfunctions_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/calendar/calendar.go b/calendar/calendar.go index b74b11da..539921f5 100644 --- a/calendar/calendar.go +++ b/calendar/calendar.go @@ -70,8 +70,8 @@ func IsWorkDay(Date time.Time) bool { return Otvet } -// UnmarshalByte - преобразует байты время в HoursMinutesSeconds{} -func (d *HoursMinutesSeconds) UnmarshalByte(b []byte) error { +// UnmarshalJSON - преобразует байты время в HoursMinutesSeconds{} +func (d *HoursMinutesSeconds) UnmarshalJSON(b []byte) error { str := string(b) err := d.UnmarshalString(str) diff --git a/calendar/calendar_test.go b/calendar/calendar_test.go index a9827368..98ab2b97 100644 --- a/calendar/calendar_test.go +++ b/calendar/calendar_test.go @@ -27,7 +27,7 @@ func TestIsWorkDay(t *testing.T) { func TestHoursMinutesSeconds_UnmarshalByte(t *testing.T) { Otvet := HoursMinutesSeconds{} - Otvet.UnmarshalByte([]byte("01:02:03")) + Otvet.UnmarshalJSON([]byte("01:02:03")) if Otvet.Hours != 1 || Otvet.Minutes != 2 || Otvet.Seconds != 3 { t.Error("TestHoursMinutesSeconds_UnmarshalByte error") } diff --git a/micro/microfunctions.go b/micro/microfunctions.go index 41034b8d..0f2ee11a 100644 --- a/micro/microfunctions.go +++ b/micro/microfunctions.go @@ -1452,8 +1452,8 @@ func StringFromBool(value bool) string { return Otvet } -//// UnmarshalByte - преобразует строку время в time.Time -//func (d *Time) UnmarshalByte(b []byte) error { +//// UnmarshalJSON - преобразует строку время в time.Time +//func (d *Time) UnmarshalJSON(b []byte) error { // str := string(b) // if str != "" && str[0] == '"' && str[len(str)-1] == '"' { // str = str[1 : len(str)-1] diff --git a/micro/microfunctions_test.go b/micro/microfunctions_test.go index 2833a7e9..87ce5206 100644 --- a/micro/microfunctions_test.go +++ b/micro/microfunctions_test.go @@ -1356,7 +1356,7 @@ func TestStringFromBool(t *testing.T) { //func TestTime_UnmarshalByte(t *testing.T) { // var Otvet Time // Test := []byte("10:05:01") -// err := (&Otvet).UnmarshalByte(Test) +// err := (&Otvet).UnmarshalJSON(Test) // if err != nil { // t.Errorf("TestTime_UnmarshalByte() error: %v", err) // }