Implement create shortcuts endpoint

Add generic UUID setter
Add ON UPDATE constraint
Implement create method for Shortcut struct
Add SetID() to DBModel interface
Add HTTP tests
Improve log output on -serve

Signed-off-by: David Kröll <[email protected]>

Author: davidkroell

.gitignore

@@ -13,5 +13,5 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-/.idea
+.idea
 .env

api.http

@@ -0,0 +1,12 @@
+POST http://localhost:9999/api/shortcuts
+Content-Type: application/json
+Accept: application/json
+
+{
+  "shortIdentifier": "htl2",
+  "redirectURL": "http://htl-villach.at",
+  "redirectStatus": 301,
+  "validThru": "2019-04-01T08:00:00.000+01:00"
+}
+
+###

main.go

@@ -41,7 +41,7 @@ func main() {
 	}
 
 	if *serve {
-		log.Println("Starting HTTP Server")
+		log.Println("HTTP Server listening on port " + os.Getenv("PORT"))
 		router := routes.InitRouter()
 		log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), &router))
 	} else if !*isMigrate && !*isFresh && *seedFile == "" {

models/database.go

@@ -21,6 +21,17 @@ type Relateable interface {
 type DBModel interface {
 	Save() (err error)
 	Delete() (err error)
+	SetID(id string)
+}
+
+func setUUIDAsID(m DBModel) error {
+	row := db.QueryRow("SELECT UUID();")
+	var id string
+	if err := row.Scan(&id); err != nil {
+		return err
+	}
+	m.SetID(id)
+	return nil
 }
 
 type DBConfig struct {

models/migrations.go

@@ -19,7 +19,7 @@ const (
   Lastname  VARCHAR(50) NOT NULL,
   Password  BINARY(60)  NOT NULL,
   CreatedAt DATETIME    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UpdatedAt DATETIME    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UpdatedAt DATETIME    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   LastLogin DATETIME,
   CHECK (UpdatedAt >= CreatedAt)
 )
@@ -33,7 +33,7 @@ const (
   RedirectURL     VARCHAR(1024) NOT NULL,
   RedirectStatus  INT(3)        NOT NULL,
   CreatedAt       DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UpdatedAt       DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UpdatedAt       DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ValidThru       DATETIME      NOT NULL,
   UserID          CHAR(36)      NOT NULL,
 

models/shortcuts.go

@@ -7,20 +7,27 @@ import (
 )
 
 type Shortcut struct {
-	ID             string
-	ShortIdentifer string
-	RedirectURL    string
-	RedirectStatus int
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-	ValidThru      time.Time
-	User           *User
+	ID             string    `json:"id"`
+	ShortIdentifer string    `json:"shortIdentifier"`
+	RedirectURL    string    `json:"redirectURL"`
+	RedirectStatus int       `json:"redirectStatus"`
+	CreatedAt      time.Time `json:"createdAt"`
+	UpdatedAt      time.Time `json:"updatedAt"`
+	ValidThru      time.Time `json:"validThru"`
+	User           *User     `json:"user"`
 	userID         string
 }
 
 const (
-	selectShortcut      string = `SELECT * FROM Shortcuts WHERE %s = ?;`
-	loadRelatedShortcut string = `SELECT * FROM Users WHERE ID = ?;`
+	selectShortcut      = `SELECT * FROM Shortcuts WHERE %s = ?;`
+	loadRelatedShortcut = `SELECT * FROM Users WHERE ID = ?;`
+	insertShortcut      = `INSERT INTO Shortcuts (ID, ShortIdentifier, RedirectURL, RedirectStatus, CreatedAt, UpdatedAt, ValidThru, UserID) VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, ?, ?);`
+	updateshortcut      = `UPDATE Shortcuts
+SET ShortIdentifier = ?
+  AND RedirectURL = ?
+  AND RedirectStatus = ?
+  AND ValidThru = ?
+WHERE ID = ?;`
 )
 
 func ShortcutBy(matcher MatchingField, value string) (*Shortcut, error) {
@@ -48,3 +55,35 @@ func (s *Shortcut) LoadRelated() (err error) {
 
 	return nil
 }
+
+func (s *Shortcut) SetID(id string) {
+	s.ID = id
+}
+
+func (s *Shortcut) Save() error {
+	if s.ID == "" {
+		return s.create()
+	}
+	return s.update()
+}
+
+func (s *Shortcut) create() error {
+	if err := setUUIDAsID(s); err != nil {
+		return err
+	}
+
+	// TODO remove
+	s.userID = "00366fb9-cd76-47e0-b3c6-cbd611650d9e"
+
+	_, err := db.Exec(insertShortcut, s.ID, s.ShortIdentifer, s.RedirectURL, s.RedirectStatus, s.ValidThru, s.userID)
+	return err
+}
+
+func (s *Shortcut) update() error {
+	_, err := db.Exec(updateshortcut, s.ShortIdentifer, s.RedirectURL, s.RedirectStatus, s.ValidThru, s.ID)
+	return err
+}
+
+func (s *Shortcut) Delete() (err error) {
+	panic("implement me")
+}

models/users.go

@@ -5,7 +5,6 @@ import (
 )
 
 const (
-	getUUID               string = `SELECT UUID()`
 	insertUser            string = `INSERT INTO Users (ID, Email, Firstname, Lastname, Password) VALUES (?, ?, ?, ?, ?);`
 	selectUserById        string = `SELECT * FROM Users WHERE ID = ?;`
 	selectUserLimitOffset string = `SELECT * FROM Users LIMIT ?, ?;`
@@ -22,6 +21,10 @@ type User struct {
 	LastLogin time.Time
 }
 
+func (u *User) SetID(id string) {
+	u.ID = id
+}
+
 func (u *User) Save() error {
 	if u.ID == "" {
 		return u.create()
@@ -30,15 +33,11 @@ func (u *User) Save() error {
 }
 
 func (u *User) create() error {
-	result, err := db.Query(getUUID)
-	if err != nil {
-		return err
-	}
-	if err := result.Scan(&u.ID); err != nil {
+	if err := setUUIDAsID(u); err != nil {
 		return err
 	}
 
-	_, err = db.Exec(insertUser, u.ID, u.Email, u.Firstname, u.LastLogin, u.Password)
+	_, err := db.Exec(insertUser, u.ID, u.Email, u.Firstname, u.LastLogin, u.Password)
 	return err
 }
 

routes/shortcuts.go

@@ -1,13 +1,37 @@
 package routes
 
 import (
+	"encoding/json"
 	"github.com/davidkroell/shortcut/models"
 	"github.com/gorilla/mux"
 	"net/http"
 )
 
 func createShortcut(w http.ResponseWriter, r *http.Request) {
+	s := models.Shortcut{}
 
+	if err := json.NewDecoder(r.Body).Decode(&s); err != nil {
+		Response{
+			Success: false,
+			Code:    1002,
+			Message: "Malformed JSON body",
+		}.JSON(w, 400)
+		return
+	}
+
+	if err := s.Save(); err != nil {
+		Response{
+			Success: false,
+			Code:    1003,
+			Message: "Internal server error. " + err.Error(),
+		}.JSON(w, 500)
+		return
+	}
+
+	Response{
+		Success: true,
+		Message: "created",
+	}.JSON(w, 201)
 }
 
 func listShortcuts(w http.ResponseWriter, r *http.Request) {
@@ -27,6 +51,7 @@ func deleteShortcut(w http.ResponseWriter, r *http.Request) {
 }
 
 func forwardShortcut(w http.ResponseWriter, r *http.Request) {
+	//start := time.Now()
 	vars := mux.Vars(r)
 	shortId := vars["shortId"]
 
@@ -53,5 +78,8 @@ func forwardShortcut(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	//end := time.Since(start)
+	//fmt.Println(end.Nanoseconds() / 1000)
+
 	http.Redirect(w, r, shortcut.RedirectURL, shortcut.RedirectStatus)
 }