Simplify to one table / struct

MichalObi · Feb 13, 2021 · 2c7c821 · 2c7c821
1 parent ba492c0
commit 2c7c821
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 250 deletions.
diff --git a/BE/cmd/api/handlers/creategroup/creategroup.go b/BE/cmd/api/handlers/creategroup/creategroup.go
diff --git a/BE/cmd/api/handlers/getgroup/getgroup.go b/BE/cmd/api/handlers/getgroup/getgroup.go
diff --git a/BE/cmd/api/handlers/getgroup/validaterequest.go b/BE/cmd/api/handlers/getgroup/validaterequest.go
diff --git a/BE/cmd/api/models/group.go b/BE/cmd/api/models/group.go
diff --git a/BE/cmd/api/models/sheet.go b/BE/cmd/api/models/sheet.go
@@ -2,29 +2,53 @@ package models
 
 import (
 	"context"
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
 	"github.com/simplesheet/pkg/application"
 )
 
+type Fields struct {
+	Field string `json:"field"`
+	Value string `json:"value"`
+}
+
+type FieldsSlice []Position
+
 type Sheet struct {
-	ID        int  `json:"id"`
-	HasMetals bool `json:"has_metals"`
-	HasCrypto bool `json:"has_crypto"`
+	ID     int         `json:"id"`
+	Type   string      `json:"type"`
+	Fields FieldsSlice `json:"fields"`
+}
+
+func (a FieldsSlice) Value() (driver.Value, error) {
+	return json.Marshal(a)
+}
+
+func (s *FieldsSlice) Scan(src interface{}) error {
+	switch v := src.(type) {
+	case []byte:
+		return json.Unmarshal(v, s)
+	case string:
+		return json.Unmarshal([]byte(v), s)
+	}
+	return errors.New("type assertion failed")
 }
 
 func (s *Sheet) Create(ctx context.Context, app *application.Application) error {
 	stmt := `
 		INSERT INTO sheets (
-			has_metals,
-      has_crypto
+			type,
+      fields
 		)
 		VALUES ($1, $2)
 		RETURNING id
 	`
 	err := app.DB.Client.QueryRowContext(
 		ctx,
 		stmt,
-		s.HasMetals,
-		s.HasCrypto,
+		s.Type,
+		s.Fields,
 	).Scan(&s.ID)
 
 	if err != nil {
@@ -46,8 +70,8 @@ func (s *Sheet) GetByID(ctx context.Context, app *application.Application) error
 		s.ID,
 	).Scan(
 		&s.ID,
-		&s.HasMetals,
-		&s.HasCrypto,
+		&s.Type,
+		&s.Fields,
 	)
 
 	if err != nil {

diff --git a/BE/cmd/api/router/router.go b/BE/cmd/api/router/router.go
@@ -2,10 +2,8 @@ package router
 
 import (
 	"github.com/julienschmidt/httprouter"
-	"github.com/simplesheet/cmd/api/handlers/creategroup"
 	"github.com/simplesheet/cmd/api/handlers/createsheet"
 	"github.com/simplesheet/cmd/api/handlers/createuser"
-	"github.com/simplesheet/cmd/api/handlers/getgroup"
 	"github.com/simplesheet/cmd/api/handlers/getsheet"
 	"github.com/simplesheet/cmd/api/handlers/getuser"
 	"github.com/simplesheet/pkg/application"
@@ -16,11 +14,9 @@ func Get(app *application.Application) *httprouter.Router {
 
 	mux.POST("/users", createuser.Do(app))
 	mux.POST("/sheets", createsheet.Do(app))
-	mux.POST("/groups", creategroup.Do(app))
 
 	mux.GET("/users/:id", getuser.Do(app))
 	mux.GET("/sheets/:id", getsheet.Do(app))
-	mux.GET("/groups/:id", getgroup.Do(app))
 
 	return mux
 }
diff --git a/BE/db/migrations/20210126103639_create_groups.down.sql b/BE/db/migrations/20210126103639_create_groups.down.sql
diff --git a/BE/db/migrations/20210126103639_create_groups.up.sql b/BE/db/migrations/20210126103639_create_groups.up.sql
diff --git a/...114402_create_sheet_metals_crypt.down.sql → ...ions/20210213110640_create_sheet.down.sql b/...114402_create_sheet_metals_crypt.down.sql → ...ions/20210213110640_create_sheet.down.sql
diff --git a/...20114402_create_sheet_metals_crypt.up.sql → ...ations/20210213110640_create_sheet.up.sql b/...20114402_create_sheet_metals_crypt.up.sql → ...ations/20210213110640_create_sheet.up.sql
@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS public.sheets
 (
     id SERIAL PRIMARY KEY,
-    has_metals BOOLEAN NOT NULL,
-    has_crypto BOOLEAN NOT NULL
+    type VARCHAR(100) NOT NULL,
+    fields JSONB NOT NULL
 );