Change migration / insert into sheet table

MichalObi · Jan 21, 2021 · ad37de8 · ad37de8
1 parent 9237929
commit ad37de8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/BE/cmd/api/models/sheet.go b/BE/cmd/api/models/sheet.go
@@ -5,26 +5,33 @@ import (
 	"github.com/simplesheet/pkg/application"
 )
 
+type Position struct {
+	Field string
+  Value string
+}
+
 type Sheet struct {
-  ID       int `json:"id"`
-  Field string `json:"field"`
-  Value string `json:"value"`
+  ID int `json:"id"`
+	HasMetals bool `json:"has_metals"`
+	HasCrypto bool `json:"has_crypto"`
+	MetalsFields []Position `json:"metals_fields"`
+	CryptoFields []Position `json:"crypto_fields"`
 }
 
 func (s *Sheet) Create(ctx context.Context, app *application.Application) error {
 	stmt := `
 		INSERT INTO sheets (
-			field,
-      value
+			has_metals,
+      has_crypto
 		)
 		VALUES ($1, $2)
 		RETURNING id
 	`
 	err := app.DB.Client.QueryRowContext(
 		ctx,
 		stmt,
-		s.Field,
-    s.Value,
+		s.HasMetals,
+    s.HasCrypto,
 	).Scan(&s.ID)
 
 	if err != nil {
@@ -46,8 +53,8 @@ func (s *Sheet) GetByID(ctx context.Context, app *application.Application) error
 		s.ID,
 	).Scan(
 		&s.ID,
-    s.Field,
-    s.Value,
+    s.HasMetals,
+    s.HasCrypto,
 	)
 
 	if err != nil {

diff --git a/BE/db/migrations/20210120114402_create_sheet_metals_crypt.up.sql b/BE/db/migrations/20210120114402_create_sheet_metals_crypt.up.sql
@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS public.sheets
 (
     id SERIAL PRIMARY KEY,
-    group_name VARCHAR(100) NOT NULL,
-    has_positions BOOLEAN NOT NULL
+    has_metals BOOLEAN NOT NULL,
+    has_crypto BOOLEAN NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS public.metals