Merge pull request #21 from nicjohnson145/feat/under-development-desi…

…gnation Feat/under development designation
nicjohnson145 · Jul 24, 2022 · c25fa0f · c25fa0f
2 parents 0284679 + 8c3b812
commit c25fa0f
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 48 deletions.
diff --git a/cmd/mixer-server/main.go b/cmd/mixer-server/main.go
@@ -8,8 +8,8 @@ import (
 	"github.com/nicjohnson145/mixer-service/pkg/drink"
 	"github.com/nicjohnson145/mixer-service/pkg/health"
 	"github.com/nicjohnson145/mixer-service/pkg/settings"
-	"github.com/nicjohnson145/mixer-service/pkg/user"
 	"github.com/nicjohnson145/mixer-service/pkg/slow"
+	"github.com/nicjohnson145/mixer-service/pkg/user"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/cmd/register/main.go b/cmd/register/main.go
@@ -1,21 +1,21 @@
 package main
 
 import (
+	"context"
 	"flag"
-	"os"
 	"github.com/carlmjohnson/requests"
-	log "github.com/sirupsen/logrus"
 	"github.com/nicjohnson145/mixer-service/pkg/auth"
 	"github.com/nicjohnson145/mixer-service/pkg/common"
 	"github.com/nicjohnson145/mixer-service/pkg/jwt"
-	"context"
+	log "github.com/sirupsen/logrus"
+	"os"
 )
 
 var (
-	username string
-	newUser string
+	username    string
+	newUser     string
 	newPassword string
-	host string
+	host        string
 )
 
 func init() {
@@ -63,11 +63,11 @@ func main() {
 	}
 
 	err = requests.
-			URL(host + common.AuthV1 + "/register-user").
-			Header(jwt.AuthenticationHeader, loginResp.AccessToken).
-			BodyJSON(&registerRequest).
-			Fetch(context.Background())
-	
+		URL(host+common.AuthV1+"/register-user").
+		Header(jwt.AuthenticationHeader, loginResp.AccessToken).
+		BodyJSON(&registerRequest).
+		Fetch(context.Background())
+
 	if err != nil {
 		log.Fatalf("Error registering user: %v", err)
 	}

diff --git a/pkg/db/migrations.go b/pkg/db/migrations.go
@@ -82,6 +82,27 @@ func createMigrations() *migrate.MemoryMigrationSource {
 				`},
 				Down: []string{"DROP TABLE user_setting;"},
 			},
+			{
+				Id: nextId(),
+				Up: []string{`
+					ALTER TABLE
+						drink
+					ADD COLUMN
+						under_development
+						INTEGER
+					NOT NULL
+					DEFAULT
+						FALSE
+					;
+				`},
+				Down: []string{`
+					ALTER TABLE
+						drink
+					DROP COLUMN
+						under_development
+					;
+				`},
+			},
 			//{
 			//    Id: nextId(),
 			//    Up: []string{},

diff --git a/pkg/drink/conversions.go b/pkg/drink/conversions.go
@@ -12,17 +12,23 @@ func fromDb(d Model) (Drink, error) {
 		return Drink{}, err
 	}
 
+	underDevelopment := false
+	if d.UnderDevelopment == 1 {
+		underDevelopment = true
+	}
+
 	return Drink{
 		ID:       d.ID,
 		Username: d.Username,
 		DrinkData: DrinkData{
-			Name:           d.Name,
-			PrimaryAlcohol: d.PrimaryAlcohol,
-			PreferredGlass: d.PreferredGlass,
-			Ingredients:    ingredients,
-			Instructions:   d.Instructions,
-			Notes:          d.Notes,
-			Publicity:      d.Publicity,
+			Name:             d.Name,
+			PrimaryAlcohol:   d.PrimaryAlcohol,
+			PreferredGlass:   d.PreferredGlass,
+			Ingredients:      ingredients,
+			Instructions:     d.Instructions,
+			Notes:            d.Notes,
+			Publicity:        d.Publicity,
+			UnderDevelopment: underDevelopment,
 		},
 	}, nil
 }
@@ -33,16 +39,22 @@ func toDb(d Drink) (Model, error) {
 		return Model{}, err
 	}
 
+	underDevelopment := 0
+	if d.UnderDevelopment {
+		underDevelopment = 1
+	}
+
 	return Model{
-		ID:             d.ID,
-		Name:           d.Name,
-		Username:       d.Username,
-		PrimaryAlcohol: d.PrimaryAlcohol,
-		PreferredGlass: d.PreferredGlass,
-		Ingredients:    ingredients,
-		Instructions:   d.Instructions,
-		Notes:          d.Notes,
-		Publicity:      d.Publicity,
+		ID:               d.ID,
+		Name:             d.Name,
+		Username:         d.Username,
+		PrimaryAlcohol:   d.PrimaryAlcohol,
+		PreferredGlass:   d.PreferredGlass,
+		Ingredients:      ingredients,
+		Instructions:     d.Instructions,
+		Notes:            d.Notes,
+		Publicity:        d.Publicity,
+		UnderDevelopment: underDevelopment,
 	}, nil
 }
 
@@ -70,4 +82,5 @@ func setDrinkDataAttributes(obj DrinkDataSetter, data DrinkDataGetter) {
 	obj.SetInstructions(data.GetInstructions())
 	obj.SetNotes(data.GetNotes())
 	obj.SetPublicity(data.GetPublicity())
+	obj.SetUnderDevelopment(data.GetUnderDevelopment())
 }
diff --git a/pkg/drink/db.go b/pkg/drink/db.go
@@ -14,15 +14,16 @@ const (
 )
 
 type Model struct {
-	ID             int64  `db:"id"`
-	Name           string `db:"name" fieldtag:"required_insert"`
-	Username       string `db:"username" fieldtag:"required_insert"`
-	PrimaryAlcohol string `db:"primary_alcohol" fieldtag:"required_insert"`
-	PreferredGlass string `db:"preferred_glass" fieldtag:"required_insert"`
-	Ingredients    string `db:"ingredients" fieldtag:"required_insert"`
-	Instructions   string `db:"instructions" fieldtag:"required_insert"`
-	Notes          string `db:"notes" fieldtag:"required_insert"`
-	Publicity      string `db:"publicity" fieldtag:"required_insert"`
+	ID               int64  `db:"id"`
+	Name             string `db:"name" fieldtag:"required_insert"`
+	Username         string `db:"username" fieldtag:"required_insert"`
+	PrimaryAlcohol   string `db:"primary_alcohol" fieldtag:"required_insert"`
+	PreferredGlass   string `db:"preferred_glass" fieldtag:"required_insert"`
+	Ingredients      string `db:"ingredients" fieldtag:"required_insert"`
+	Instructions     string `db:"instructions" fieldtag:"required_insert"`
+	Notes            string `db:"notes" fieldtag:"required_insert"`
+	Publicity        string `db:"publicity" fieldtag:"required_insert"`
+	UnderDevelopment int    `db:"under_development" fieldtag:"required_insert"`
 }
 
 func getByID(id int64, db *sql.DB) (*Model, error) {

diff --git a/pkg/drink/drink_data.go b/pkg/drink/drink_data.go
@@ -1,13 +1,14 @@
 package drink
 
 type DrinkData struct {
-	Name           string   `json:"name" validate:"required"`
-	PrimaryAlcohol string   `json:"primary_alcohol" validate:"required"`
-	PreferredGlass string   `json:"preferred_glass,omitempty"`
-	Ingredients    []string `json:"ingredients" validate:"required"`
-	Instructions   string   `json:"instructions,omitempty"`
-	Notes          string   `json:"notes,omitempty"`
-	Publicity      string   `json:"publicity" validate:"required"`
+	Name             string   `json:"name" validate:"required"`
+	PrimaryAlcohol   string   `json:"primary_alcohol" validate:"required"`
+	PreferredGlass   string   `json:"preferred_glass,omitempty"`
+	Ingredients      []string `json:"ingredients" validate:"required"`
+	Instructions     string   `json:"instructions,omitempty"`
+	Notes            string   `json:"notes,omitempty"`
+	Publicity        string   `json:"publicity" validate:"required"`
+	UnderDevelopment bool     `json:"under_development"`
 }
 
 func (d *DrinkData) SetName(v string) {
@@ -66,6 +67,14 @@ func (d DrinkData) GetPublicity() string {
 	return d.Publicity
 }
 
+func (d *DrinkData) SetUnderDevelopment(v bool) {
+	d.UnderDevelopment = v
+}
+
+func (d DrinkData) GetUnderDevelopment() bool {
+	return d.UnderDevelopment
+}
+
 type DrinkDataOperator interface {
 	DrinkDataSetter
 	DrinkDataGetter
@@ -79,6 +88,7 @@ type DrinkDataSetter interface {
 	SetInstructions(string)
 	SetNotes(string)
 	SetPublicity(string)
+	SetUnderDevelopment(bool)
 }
 
 type DrinkDataGetter interface {
@@ -89,4 +99,5 @@ type DrinkDataGetter interface {
 	GetInstructions() string
 	GetNotes() string
 	GetPublicity() string
+	GetUnderDevelopment() bool
 }
diff --git a/pkg/drink/drink_test.go b/pkg/drink/drink_test.go
@@ -184,7 +184,8 @@ func TestFullCRUDLoop(t *testing.T) {
 			"0.5 oz simple syrup",
 			"1 oz lime",
 		},
-		Publicity: DrinkPublicityPrivate,
+		Publicity:        DrinkPublicityPrivate,
+		UnderDevelopment: true,
 	}
 	updatedDrinkData := DrinkData{
 		Name:           "Daquari",
@@ -195,7 +196,8 @@ func TestFullCRUDLoop(t *testing.T) {
 			"0.5 oz simple syrup",
 			"0.75 oz lime",
 		},
-		Publicity: DrinkPublicityPrivate,
+		Publicity:        DrinkPublicityPrivate,
+		UnderDevelopment: false,
 	}
 
 	body := CreateDrinkRequest{DrinkData: origDrinkData}

diff --git a/pkg/slow/slowdown.go b/pkg/slow/slowdown.go
@@ -2,12 +2,11 @@ package slow
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"os"
 	log "github.com/sirupsen/logrus"
+	"os"
 	"time"
 )
 
-
 func SlowDown(app *fiber.App) {
 	val, ok := os.LookupEnv("SLOWDOWN_AMOUNT")
 	if !ok {