mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-20 09:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

modify method name

Browse Source
This commit is contained in:
MaysWind
2021-04-18 22:48:54 +08:00
parent 1429bde783
commit 112cbd3bfa
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/utils/datetimes.go
+8 -8
View File
@@ -14,12 +14,12 @@ const (
// FormatUnixTimeToLongDateTimeInServerTimezone returns a textual representation of the unix time formatted by long date time format // FormatUnixTimeToLongDateTimeInServerTimezone returns a textual representation of the unix time formatted by long date time format
func FormatUnixTimeToLongDateTimeInServerTimezone(unixTime int64) string { func FormatUnixTimeToLongDateTimeInServerTimezone(unixTime int64) string {
return ParseFromUnixTime(unixTime).Format(longDateTimeFormat) return parseFromUnixTime(unixTime).Format(longDateTimeFormat)
} }
// FormatUnixTimeToLongDateTimeWithoutSecond returns a textual representation of the unix time formatted by long date time format (no second) // FormatUnixTimeToLongDateTimeWithoutSecond returns a textual representation of the unix time formatted by long date time format (no second)
func FormatUnixTimeToLongDateTimeWithoutSecond(unixTime int64, timezone *time.Location) string { func FormatUnixTimeToLongDateTimeWithoutSecond(unixTime int64, timezone *time.Location) string {
t := ParseFromUnixTime(unixTime) t := parseFromUnixTime(unixTime)
if timezone != nil { if timezone != nil {
t = t.In(timezone) t = t.In(timezone)
@@ -30,7 +30,7 @@ func FormatUnixTimeToLongDateTimeWithoutSecond(unixTime int64, timezone *time.Lo
// FormatUnixTimeToYearMonth returns year and month of specified unix time // FormatUnixTimeToYearMonth returns year and month of specified unix time
func FormatUnixTimeToYearMonth(unixTime int64, timezone *time.Location) string { func FormatUnixTimeToYearMonth(unixTime int64, timezone *time.Location) string {
t := ParseFromUnixTime(unixTime) t := parseFromUnixTime(unixTime)
if timezone != nil { if timezone != nil {
t = t.In(timezone) t = t.In(timezone)
@@ -39,11 +39,6 @@ func FormatUnixTimeToYearMonth(unixTime int64, timezone *time.Location) string {
return t.Format(yearMonthDateTimeFormat) return t.Format(yearMonthDateTimeFormat)
} }
// ParseFromUnixTime parses a unix time and returns a golang time struct
func ParseFromUnixTime(unixTime int64) time.Time {
return time.Unix(unixTime, 0)
}
// ParseFromLongDateTime parses a formatted string in long date time format // ParseFromLongDateTime parses a formatted string in long date time format
func ParseFromLongDateTime(t string, utcOffset int16) (time.Time, error) { func ParseFromLongDateTime(t string, utcOffset int16) (time.Time, error) {
timezone := time.FixedZone("Timezone", int(utcOffset)*60) timezone := time.FixedZone("Timezone", int(utcOffset)*60)
@@ -88,3 +83,8 @@ func GetMaxTransactionTimeFromUnixTime(unixTime int64) int64 {
func GetUnixTimeFromTransactionTime(transactionTime int64) int64 { func GetUnixTimeFromTransactionTime(transactionTime int64) int64 {
return transactionTime / 1000 return transactionTime / 1000
} }
// parseFromUnixTime parses a unix time and returns a golang time struct
func parseFromUnixTime(unixTime int64) time.Time {
return time.Unix(unixTime, 0)
}
pkg/utils/datetimes_test.go
+7 -7
View File
@@ -35,13 +35,6 @@ func TestFormatUnixTimeToYearMonth(t *testing.T) {
assert.Equal(t, expectedValue, actualValue) assert.Equal(t, expectedValue, actualValue)
} }
func TestParseFromUnixTime(t *testing.T) {
expectedValue := int64(1617228083)
actualTime := ParseFromUnixTime(expectedValue)
actualValue := actualTime.Unix()
assert.Equal(t, expectedValue, actualValue)
}
func TestParseFromLongDateTime(t *testing.T) { func TestParseFromLongDateTime(t *testing.T) {
expectedValue := int64(1617228083) expectedValue := int64(1617228083)
actualTime, err := ParseFromLongDateTime("2021-04-01 06:01:23", 480) actualTime, err := ParseFromLongDateTime("2021-04-01 06:01:23", 480)
@@ -99,3 +92,10 @@ func TestGetUnixTimeFromTransactionTime(t *testing.T) {
actualValue := GetUnixTimeFromTransactionTime(1617228083999) actualValue := GetUnixTimeFromTransactionTime(1617228083999)
assert.Equal(t, expectedValue, actualValue) assert.Equal(t, expectedValue, actualValue)
} }
func TestParseFromUnixTime(t *testing.T) {
expectedValue := int64(1617228083)
actualTime := parseFromUnixTime(expectedValue)
actualValue := actualTime.Unix()
assert.Equal(t, expectedValue, actualValue)
}