|
@@ -1262,7 +1262,8 @@ func (estimate *Estimate) insertResults(db *sql.DB) error { |
|
|
return nil |
|
|
return nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func insertUser(db *sql.DB, user User) (User, error) { |
|
|
|
|
|
|
|
|
// Insert user returning it's ID or any error |
|
|
|
|
|
func insertUser(db *sql.DB, user User) (int, error) { |
|
|
var query string |
|
|
var query string |
|
|
var row *sql.Row |
|
|
var row *sql.Row |
|
|
var err error |
|
|
var err error |
|
@@ -1270,7 +1271,7 @@ func insertUser(db *sql.DB, user User) (User, error) { |
|
|
|
|
|
|
|
|
user.Address.Id, err = insertAddress(db, user.Address) |
|
|
user.Address.Id, err = insertAddress(db, user.Address) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return user, err |
|
|
|
|
|
|
|
|
return 0, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
query = `INSERT INTO user |
|
|
query = `INSERT INTO user |
|
@@ -1313,15 +1314,12 @@ func insertUser(db *sql.DB, user User) (User, error) { |
|
|
|
|
|
|
|
|
err = row.Scan(&id) |
|
|
err = row.Scan(&id) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return User{}, err |
|
|
|
|
|
|
|
|
return 0, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
user, err = queryUser(db, id) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return User{}, err |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
user.Id = id |
|
|
|
|
|
|
|
|
return user, nil |
|
|
|
|
|
|
|
|
return id, nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func updateAddress(address Address, db *sql.DB) error { |
|
|
func updateAddress(address Address, db *sql.DB) error { |
|
@@ -1527,7 +1525,7 @@ func createUser(w http.ResponseWriter, db *sql.DB, r *http.Request) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
user, err = insertUser(db, user) |
|
|
|
|
|
|
|
|
user.Id, err = insertUser(db, user) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
http.Error(w, err.Error(), 422) |
|
|
http.Error(w, err.Error(), 422) |
|
|
return |
|
|
return |
|
@@ -3028,12 +3026,12 @@ func seedUsers(db *sql.DB, addresses []Address, branches []Branch) []User { |
|
|
users[2].Role = "Admin" |
|
|
users[2].Role = "Admin" |
|
|
|
|
|
|
|
|
for i := range users { |
|
|
for i := range users { |
|
|
u, err := insertUser(db, users[i]) |
|
|
|
|
|
|
|
|
var err error |
|
|
|
|
|
users[i].Id, err = insertUser(db, users[i]) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
log.Println(err) |
|
|
log.Println(err) |
|
|
break |
|
|
break |
|
|
} |
|
|
} |
|
|
users[i].Id = u.Id |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return users |
|
|
return users |
|
|