Merge pull request #2268 from weaveworks/reduce-trial-length

Reduce the trial length

billing-api/trial/trial.go

@@ -7,16 +7,9 @@ import (
 	common_time "github.com/weaveworks/service/common/time"
 )
 
-const (
-	trialFlag          string = "trial:days"
-	defaultTrialLength int    = 30
-)
-
 // Trial is a bundle of information about the trial period used by the frontend.
 type Trial struct {
-	// Length is the original length of trial period. This isn't actually
-	// used. TODO(jml): Remove this field once weaveworks/service-ui#1037 is
-	// deployed to production.
+	// Length is the original length of trial period.
 	Length int `json:"length"`
 	// Remaining is the number of days remaining, rounded to whole days.
 	Remaining int `json:"remaining"`

billing-api/trial/trial_test.go

@@ -66,7 +66,7 @@ func TestTrialInfo(t *testing.T) {
 				TrialExpiresAt: now.Add(asDays(20) + 1*time.Hour),
 			},
 			trial: trial.Trial{
-				Length:    int(users.TrialDuration.Hours() / 24),
+				Length:    30,
 				Remaining: 21,
 				Start:     now.Add(asDays(-10) + 1*time.Hour),
 				End:       now.Add(asDays(20) + 1*time.Hour),

users/api/admin_test.go

@@ -190,18 +190,18 @@ func TestAPI_adminTrial(t *testing.T) {
 	defer cleanup(t)
 
 	usr, org := getOrg(t)
-	assert.Equal(t, 30, org.TrialRemaining(), "trial is not 30 days on instance creation")
+	assert.Equal(t, 14, org.TrialRemaining(), "trial is not 14 days on instance creation")
 
 	{ // Cannot shrink
 		w := httptest.NewRecorder()
-		r := requestAs(t, usr, "POST", fmt.Sprintf("/admin/users/organizations/%s/trial", org.ExternalID), strings.NewReader("remaining=29"))
+		r := requestAs(t, usr, "POST", fmt.Sprintf("/admin/users/organizations/%s/trial", org.ExternalID), strings.NewReader("remaining=9"))
 		r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 		app.ServeHTTP(w, r)
 		assert.Equal(t, http.StatusFound, w.Code)
 
 		org, err := database.FindOrganizationByID(context.TODO(), org.ExternalID)
 		assert.NoError(t, err)
-		assert.Equal(t, 30, org.TrialRemaining())
+		assert.Equal(t, 14, org.TrialRemaining())
 	}
 	{ // but can expand
 		w := httptest.NewRecorder()

users/organization.go

@@ -13,11 +13,11 @@ import (
 const (
 	// TrialExtensionDuration is the extension period if billing is
 	// enabled for an existing customer
-	TrialExtensionDuration = 15 * 24 * time.Hour
+	TrialExtensionDuration = 7 * 24 * time.Hour
 
 	// TrialRefuseDataUploadAfter is the period after the trial expired before an
 	// instance's data upload is restricted.
-	TrialRefuseDataUploadAfter = 15 * 24 * time.Hour
+	TrialRefuseDataUploadAfter = 7 * 24 * time.Hour
 
 	defaultTeamNameTemplate = "%v Team"
 )

users/user.go

@@ -9,7 +9,7 @@ import (
 
 // TrialDuration is how long a user has a free trial
 // period before we start charging for it.
-const TrialDuration = 30 * 24 * time.Hour
+const TrialDuration = 14 * 24 * time.Hour
 
 // FindUserByIDer is an interface of just FindUserByID, for loosely coupling
 // things to the db.DB