Cleanup

cmd/add.go

@@ -1,17 +1,13 @@
 package cmd
 
 import (
-	"eager/internal"
 	"github.com/spf13/cobra"
 )
 
 func init() {
 	// TODO mro Reactivate that command after implementing it
 	//rootCmd.AddCommand(addCmd)
 	addCmd.AddCommand(addJiraCmd)
-
-	addCmd.PersistentFlags().Bool(internal.FlagAll, false, "Add all items to the backend")
-	addCmd.PersistentFlags().Bool(internal.FlagForce, false, "Overwrite existing values")
 }
 
 var addCmd = &cobra.Command{

internal/configuration.go

@@ -20,8 +20,6 @@ const (
 	FlagEmpty         = "empty"
 	FlagDecimal       = "decimal"
 	FlagNegate        = "negate"
-	FlagAll           = "all"
-	FlagForce         = "force"
 )
 
 type Configuration struct {

pkg/csv.go

@@ -193,14 +193,14 @@ func (ts Timesheet) WriteCsv(writer io.Writer, spec *CsvSpecification, opts *int
 	}
 
 	currentUser := ts[0].User
-	currentDate := time.Date(ts[0].Date.Year(), time.Month(ts[0].Date.Month()), 1, 0, 0, 0, 0, time.UTC)
+	currentDate := time.Date(ts[0].Date.Year(), ts[0].Date.Month(), 1, 0, 0, 0, 0, time.UTC)
 	for _, effort := range ts {
 		if currentUser != nil && currentUser.DisplayName != effort.User.DisplayName {
 			if currentDate.Day() > 1 {
 				emptyLinesForDaysBetween(csvw, spec, currentDate, currentDate.AddDate(0, 1, 1-currentDate.Day()), currentUser, opts.Decimal)
 			}
 			currentUser = effort.User
-			currentDate = time.Date(effort.Date.Year(), time.Month(effort.Date.Month()), 1, 0, 0, 0, 0, time.UTC)
+			currentDate = time.Date(effort.Date.Year(), effort.Date.Month(), 1, 0, 0, 0, 0, time.UTC)
 		}
 		if opts.Empty {
 			emptyLinesForDaysBetween(csvw, spec, currentDate, effort.Date, effort.User, opts.Decimal)

pkg/http.go

@@ -37,6 +37,6 @@ func (f RoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
 
 func NewTestClient(fn RoundTripFunc) *http.Client {
 	return &http.Client{
-		Transport: RoundTripFunc(fn),
+		Transport: fn,
 	}
 }

pkg/jira/jira.go

@@ -159,7 +159,7 @@ func do(api model.Api, year int, month time.Month, projects []pkg.Project, accou
 						effort <- pkg.Effort{
 							User:        user,
 							Description: worklog.Comment(),
-							Project:     pkg.Project(issue.Project()),
+							Project:     issue.Project(),
 							Task:        pkg.Task(issue.Key()),
 							Date:        date,
 							Duration:    worklog.Duration(),

pkg/jira/model/jql.go

@@ -23,7 +23,7 @@ func (query Jql) Projects(projects ...pkg.Project) Jql {
 	for i, project := range projects {
 		result[i] = string(project)
 	}
-	return Jql(append(query, fmt.Sprintf(jqlWorklogProject, strings.Join(result, "','"))))
+	return append(query, fmt.Sprintf(jqlWorklogProject, strings.Join(result, "','")))
 }
 
 func (query Jql) Users(users ...Account) Jql {
@@ -34,11 +34,11 @@ func (query Jql) Users(users ...Account) Jql {
 	for i, user := range users {
 		result[i] = string(user)
 	}
-	return Jql(append(query, fmt.Sprintf(jqlWorklogAuthor, "'"+strings.Join(result, "','")+"'")))
+	return append(query, fmt.Sprintf(jqlWorklogAuthor, "'"+strings.Join(result, "','")+"'"))
 }
 
 func (query Jql) Between(fromDate, toDate time.Time) Jql {
-	return Jql(append(query, fmt.Sprintf(jqlWorklogDate, fromDate.Format(pkg.IsoYearMonthDaySlash), toDate.Format(pkg.IsoYearMonthDaySlash))))
+	return append(query, fmt.Sprintf(jqlWorklogDate, fromDate.Format(pkg.IsoYearMonthDaySlash), toDate.Format(pkg.IsoYearMonthDaySlash)))
 }
 
 func (query Jql) Build() string {

pkg/jira/v2/api_test.go

@@ -90,7 +90,7 @@ func addProject(host string, port nat.Port) projectKey {
 		Key projectKey `json:"key"`
 	}
 	data, _ := ioutil.ReadAll(response.Body)
-	_ = json.Unmarshal(data, result)
+	_ = json.Unmarshal(data, &result)
 	return result.Key
 }
 
@@ -129,7 +129,7 @@ func addIssue(host string, port nat.Port, key projectKey) model.IssueKey {
 		Key model.IssueKey `json:"key"`
 	}
 	data, _ := ioutil.ReadAll(response.Body)
-	_ = json.Unmarshal(data, result)
+	_ = json.Unmarshal(data, &result)
 	return result.Key
 }