Merge pull request #95 from adamdecaf/customers-mysql-query-fix

cmd/server: fix create customer query for mysql

CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.4.1 (Released 2020-07-16)
+
+IMPROVEMENTS
+
+- cmd/keygen: add script for generating high-quality gocloud.dev key URIs
+- docs: clarify TRANSIT_LOCAL_BASE64_KEY is used for temporary encryption
+
+BUG FIXES
+
+- cmd/server: fix create customer query for mysql
+
 ## v0.4.0 (Released 2020-07-09)
 
 ADDITIONS

cmd/server/customers.go

@@ -336,7 +336,7 @@ values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`
 	}
 
 	// Insert customer phone numbers
-	query = `insert or replace into customers_phones (customer_id, number, valid, type) values (?, ?, ?, ?);`
+	query = `replace into customers_phones (customer_id, number, valid, type) values (?, ?, ?, ?);`
 	stmt, err = tx.Prepare(query)
 	if err != nil {
 		return fmt.Errorf("createCustomer: insert into customers_phones err=%v | rollback=%v", err, tx.Rollback())
@@ -351,7 +351,7 @@ values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`
 	stmt.Close()
 
 	// Insert customer addresses
-	query = `insert or replace into customers_addresses(address_id, customer_id, type, address1, address2, city, state, postal_code, country, validated) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`
+	query = `replace into customers_addresses(address_id, customer_id, type, address1, address2, city, state, postal_code, country, validated) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`
 	stmt, err = tx.Prepare(query)
 	if err != nil {
 		return fmt.Errorf("createCustomer: insert into customers_addresses err=%v | rollback=%v", err, tx.Rollback())

cmd/server/customers_test.go

@@ -145,6 +145,29 @@ func TestCustomers__GetCustomer(t *testing.T) {
 	}
 }
 
+func TestCustomerRepository__createCustomer(t *testing.T) {
+	check := func(t *testing.T, repo *sqlCustomerRepository) {
+		cust, _, _ := (customerRequest{
+			FirstName: "Jane",
+			LastName:  "Doe",
+			Email:     "[email protected]",
+		}).asCustomer(testCustomerSSNStorage(t))
+		if err := repo.createCustomer(cust); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// SQLite tests
+	sqliteDB := database.CreateTestSqliteDB(t)
+	defer sqliteDB.Close()
+	check(t, &sqlCustomerRepository{sqliteDB.DB, log.NewNopLogger()})
+
+	// MySQL tests
+	mysqlDB := database.CreateTestMySQLDB(t)
+	defer mysqlDB.Close()
+	check(t, &sqlCustomerRepository{mysqlDB.DB, log.NewNopLogger()})
+}
+
 func TestCustomers__GetCustomersError(t *testing.T) {
 	repo := &testCustomerRepository{err: errors.New("bad error")}