Merge pull request #107 from devopsdays/add-event-field-validation

Add additional event validation

Author: mattstratton

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.16.4](https://github.com/devopsdays/devopsdays-cli/tree/0.16.4) (2017-10-06)
+[Full Changelog](https://github.com/devopsdays/devopsdays-cli/compare/0.16.3...0.16.4)
+
 ## [0.16.3](https://github.com/devopsdays/devopsdays-cli/tree/0.16.3) (2017-10-06)
 [Full Changelog](https://github.com/devopsdays/devopsdays-cli/compare/0.16.2...0.16.3)
 

event/event.go

@@ -49,20 +49,38 @@ var qsCreateEvent = []*survey.Question{
 			Message: "Enter your Google Analytics ID [optional]:",
 			Help:    "This will allow your page to be tracked. Example: UA-74738648-1.",
 		},
+		Validate: func(val interface{}) error {
+			if str, _ := val.(string); (str != "") && (helpers.ValidateField(str, "googleanalytics") == false) {
+				return errors.New("Please enter a valid Google Analytics ID. Example: UA-74738648-1")
+			}
+			return nil
+		},
 	},
 	{
 		Name: "startdate",
 		Prompt: &survey.Input{
-			Message: "Enter the event's start date [optional]:",
+			Message: "Enter the event's start date in the format of YYYY-MM-YY [optional]:",
 			Help:    "You can only provide a date for your event if you have a signed contract with your venue.",
 		},
+		Validate: func(val interface{}) error {
+			if str, _ := val.(string); (str != "") && (helpers.ValidateField(str, "date") == false) {
+				return errors.New("Please enter a valid date. Example: 2018-01-30.")
+			}
+			return nil
+		},
 	},
 	{
 		Name: "enddate",
 		Prompt: &survey.Input{
-			Message: "Enter the event's end date [optional]:",
+			Message: "Enter the event's end date in the format of YYYY-MM-YY [optional]:",
 			Help:    "For single-day events make the end date the same as the start date. You can only provide a date for your event if you have a signed contract with your venue.",
 		},
+		Validate: func(val interface{}) error {
+			if str, _ := val.(string); (str != "") && (helpers.ValidateField(str, "date") == false) {
+				return errors.New("Please enter a valid date. Example: 2018-01-30.")
+			}
+			return nil
+		},
 	},
 	{
 		Name: "coordinates",
@@ -151,6 +169,11 @@ func CreateEvent(city, year string) (err error) {
 		survey.AskOne(prompt, &year, survey.Required)
 	}
 
+	if CheckEvent(city, year) {
+		fmt.Println("This event already exists. If you would like to edit it, please run `devopsdays-cli edit event`")
+		return
+	}
+
 	surveyErr := survey.Ask(qsCreateEvent, &answers)
 	if surveyErr != nil {
 		fmt.Println(surveyErr.Error())

helpers/validate_field.go

@@ -1,6 +1,7 @@
 package helpers
 
 import (
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -60,6 +61,15 @@ func ValidateField(input, field string) bool {
 	case "filepath":
 		ret, _ := govalidator.IsFilePath(input)
 		return ret
+	case "date":
+		ret := govalidator.IsTime(input, "2006-01-02")
+		return ret
+	case "googleanalytics":
+		ret, _ := regexp.MatchString(`UA-[0-9]{8}-[0-9]`, input)
+		return ret
+	case "coordinates":
+		ret, _ := regexp.MatchString(`-?[0-9]+\.[0-9]+,\W?-?[0-9]+.[0-9]+`, input)
+		return ret
 	}
 	return true // TODO: Make this return an error if no field was matched
 }

helpers/validate_field_test.go

@@ -150,4 +150,76 @@ func TestValidateField(t *testing.T) {
 			})
 		})
 	})
+	Convey("Given a validation request for a date", t, func() {
+		Convey("When the string is 2016-01-05", func() {
+			date := "2016-01-05"
+			Convey("Then the response should be true", func() {
+				So(ValidateField(date, "date"), ShouldEqual, true)
+			})
+		})
+		Convey("When the string is 16-01-05", func() {
+			date := "16-01-05"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(date, "date"), ShouldEqual, false)
+			})
+		})
+		Convey("When the date is March 1, 2016", func() {
+			date := "March 1, 2016"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(date, "date"), ShouldEqual, false)
+			})
+		})
+		Convey("When the date is 2016-30-01", func() {
+			date := "2016-30-01"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(date, "date"), ShouldEqual, false)
+			})
+		})
+	})
+	Convey("Given a validation request for a GA ID", t, func() {
+		Convey("When the ID is UA-74738648-1", func() {
+			googleanalytics := "UA-74738648-1"
+			Convey("Then the response should be true", func() {
+				So(ValidateField(googleanalytics, "googleanalytics"), ShouldEqual, true)
+			})
+		})
+		Convey("When the ID is 123456", func() {
+			googleanalytics := "123456"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(googleanalytics, "googleanalytics"), ShouldEqual, false)
+			})
+		})
+	})
+	Convey("Given a validation request for coordinates", t, func() {
+		Convey("When the string is 41.882219, -87.640530", func() {
+			coordinates := "41.882219, -87.640530"
+			Convey("Then the response should be true", func() {
+				So(ValidateField(coordinates, "coordinates"), ShouldEqual, true)
+			})
+		})
+		Convey("When the string is 41.882219,-87.640530", func() {
+			coordinates := "41.882219,-87.640530"
+			Convey("Then the response should be true", func() {
+				So(ValidateField(coordinates, "coordinates"), ShouldEqual, true)
+			})
+		})
+		Convey("When the string is 41.882219,  -87.640530", func() {
+			coordinates := "41.882219,  -87.640530"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(coordinates, "coordinates"), ShouldEqual, false)
+			})
+		})
+		Convey("When the string is 41, -87", func() {
+			coordinates := "41, -87"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(coordinates, "coordinates"), ShouldEqual, false)
+			})
+		})
+		Convey("When the string is 41.882219 -87.640530", func() {
+			coordinates := "41.882219 -87.640530"
+			Convey("Then the response should be false", func() {
+				So(ValidateField(coordinates, "coordinates"), ShouldEqual, false)
+			})
+		})
+	})
 }