fix issue with launches merge

avarabyeu · Apr 15, 2019 · 10c7e1e · 10c7e1e
1 parent 5571f28
commit 10c7e1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/cli/launch.go b/cli/launch.go
@@ -3,11 +3,9 @@ package cli
 import (
 	"errors"
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/avarabyeu/goRP/gorp"
 	"gopkg.in/urfave/cli.v1"
+	"strings"
 )
 
 var (
@@ -85,8 +83,6 @@ func mergeLaunches(c *cli.Context) error {
 		Name:      c.String("name"),
 		MergeType: gorp.MergeType(c.String("type")),
 		Launches:  ids,
-		StartTime: gorp.Timestamp{Time: time.Now().Add(-10 * time.Hour)},
-		EndTime:   gorp.Timestamp{Time: time.Now().Add(-1 * time.Minute)},
 	}
 	launchResource, err := rpClient.MergeLaunches(rq)
 	if err != nil {

diff --git a/gorp/model.go b/gorp/model.go
@@ -101,15 +101,15 @@ type (
 
 	//MergeLaunchesRQ payload representation
 	MergeLaunchesRQ struct {
-		Description             string    `json:"description,omitempty"`
-		StartTime               Timestamp `json:"start_time,omitempty"`
-		EndTime                 Timestamp `json:"end_time,omitempty"`
-		ExtendSuitesDescription bool      `json:"extendSuitesDescription,omitempty"`
-		Launches                []string  `json:"launches"`
-		MergeType               MergeType `json:"merge_type,omitempty"`
-		Mode                    string    `json:"mode,omitempty"`
-		Tags                    []string  `json:"tags,omitempty"`
-		Name                    string    `json:"name,omitempty"`
+		Description             string     `json:"description,omitempty"`
+		StartTime               *Timestamp `json:"start_time,omitempty"`
+		EndTime                 *Timestamp `json:"end_time,omitempty"`
+		ExtendSuitesDescription bool       `json:"extendSuitesDescription,omitempty"`
+		Launches                []string   `json:"launches"`
+		MergeType               MergeType  `json:"merge_type,omitempty"`
+		Mode                    string     `json:"mode,omitempty"`
+		Tags                    []string   `json:"tags,omitempty"`
+		Name                    string     `json:"name,omitempty"`
 	}
 
 	//StartRQ payload representation