Resolve sonar code quality issues

edward-yakop · Jan 29, 2021 · ca52768 · ca52768
1 parent fb3d531
commit ca52768
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/internal/app/dukapp.go b/internal/app/dukapp.go
@@ -116,11 +116,11 @@ func ParseOption(args ArgsList) (*AppOption, error) {
 }
 
 func handleTimeArguments(args ArgsList, opt *AppOption) (err error) {
-	if opt.Start, err = time.ParseInLocation("2006-01-02", args.Start, time.UTC); err != nil {
+	if opt.Start, err = parseDateArgument(args.Start); err != nil {
 		err = errors.Wrap(err, "invalid start parameter")
 		return
 	}
-	if opt.End, err = time.ParseInLocation("2006-01-02", args.End, time.UTC); err != nil {
+	if opt.End, err = parseDateArgument(args.End); err != nil {
 		err = fmt.Errorf("invalid end parameter")
 		return
 	}
@@ -131,6 +131,10 @@ func handleTimeArguments(args ArgsList, opt *AppOption) (err error) {
 	return
 }
 
+func parseDateArgument(dateString string) (time.Time, error) {
+	return time.ParseInLocation("2006-01-02", dateString, time.UTC)
+}
+
 // NewOutputs create timeframe instance
 //
 func NewOutputs(opt *AppOption) []core.Converter {
@@ -193,10 +197,10 @@ func (app *DukaApp) Execute() error {
 	for day := opt.Start; day.Unix() < opt.End.Unix(); day = day.Add(24 * time.Hour) {
 		// Download, parse, store
 		if td, err := iTickdata.FetchDay(opt.Instrument, day, opt.Folder); err != nil {
-			err = errors.Wrap(err, "Failed to fetch ["+day.Format("2006-01-02")+"]")
+			err = errors.Wrap(err, "Failed to fetch ["+misc.TimeToDayString(day)+"]")
 			return err
 		} else if err = app.export(td); err != nil {
-			err = errors.Wrap(err, "Failed to export ["+day.Format("2006-01-02")+"]")
+			err = errors.Wrap(err, "Failed to export ["+misc.TimeToDayString(day)+"]")
 		}
 	}
 

diff --git a/internal/export/csv/csv.go b/internal/export/csv/csv.go
@@ -67,13 +67,15 @@ func (c *CsvDump) PackTicks(barTimestamp uint32, ticks []*tickdata.TickData) err
 	return nil
 }
 
+const dayFormat = "2006-01-02"
+
 // worker goroutine which flust data to disk
 //
 func (c *CsvDump) worker() error {
 	fname := fmt.Sprintf("%s-%s-%s.%s",
 		c.instrument.Code(),
-		c.day.Format("2006-01-02"),
-		c.end.Format("2006-01-02"),
+		c.day.Format(dayFormat),
+		c.end.Format(dayFormat),
 		ext)
 
 	fpath := filepath.Join(c.dest, fname)

diff --git a/internal/misc/time.go b/internal/misc/time.go
@@ -9,3 +9,7 @@ func ToHour(t time.Time) time.Time {
 func ToHourUTC(t time.Time) time.Time {
 	return ToHour(t).UTC()
 }
+
+func TimeToDayString(t time.Time) string {
+	return t.Format("2006-01-02")
+}