Add card_id in swipe record

yasuflatland-lf · Aug 16, 2024 · 0a047eb · 0a047eb
1 parent 3005ba9
commit 0a047eb
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 23 deletions.
diff --git a/backend/db/migrations/20240704123000_create_users_and_cards_tables.sql b/backend/db/migrations/20240704123000_create_users_and_cards_tables.sql
@@ -79,13 +79,16 @@ CREATE TABLE IF NOT EXISTS swipe_records
 (
     id   BIGSERIAL PRIMARY KEY,
     user_id BIGINT NOT NULL,
+    card_id BIGINT NOT NULL,
     direction TEXT NOT NULL,
     created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+    FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
+    FOREIGN KEY (card_id) REFERENCES cards (id) ON DELETE CASCADE
 );
 CREATE INDEX idx_swipe_records_id ON swipe_records(id);
 CREATE INDEX idx_swipe_records_user_id ON swipe_records(user_id);
+CREATE INDEX idx_swipe_records_card_id ON swipe_records(card_id);
 
 -- +goose statementbegin
 -- When the updated column is not changed, assign NULL

diff --git a/backend/graph/db/model.go b/backend/graph/db/model.go
@@ -54,6 +54,7 @@ type Role struct {
 type SwipeRecord struct {
 	ID        int64     `gorm:"column:id;primaryKey" validate:"number"`
 	UserID    int64     `gorm:"column:user_id" validate:"number"`
+	CardID    int64     `gorm:"column:card_id" validate:"number"`
 	Direction string    `gorm:"column:direction;not null" validate:"required"`
 	Created   time.Time `gorm:"column:created;autoCreateTime"`
 	Updated   time.Time `gorm:"column:updated;autoCreateTime"`

diff --git a/backend/graph/generated.go b/backend/graph/generated.go
diff --git a/backend/graph/model/models_gen.go b/backend/graph/model/models_gen.go
diff --git a/backend/graph/schema.graphqls b/backend/graph/schema.graphqls
@@ -100,6 +100,7 @@ type CardGroupConnection {
 type SwipeRecord {
   id: ID!
   userId: ID!
+  cardId: ID!
   direction: String! @validation(format: "required")
   created: Time!
   updated: Time!

diff --git a/backend/graph/schema.resolvers.go b/backend/graph/schema.resolvers.go
diff --git a/backend/graph/schema.resolvers_test.go b/backend/graph/schema.resolvers_test.go
@@ -2123,7 +2123,7 @@ func TestGraphQLErrors(t *testing.T) {
 			testGraphQLQuery(t, e, jsonInput, expected)
 		})
 
-		t.Run("Upsert Dictionaly Smoke", func(t *testing.T) {
+		t.Run("Upsert Dictionary Smoke", func(t *testing.T) {
 			t.Helper()
 			t.Parallel()
 
@@ -2132,7 +2132,7 @@ func TestGraphQLErrors(t *testing.T) {
 			roleService := services.NewRoleService(db, 20)
 
 			ctx := context.Background()
-			createdGroup, _ := testutils.CreateUserAndCardGroup(ctx, userService, cardGroupService, roleService)
+			createdGroup, _, _ := testutils.CreateUserAndCardGroup(ctx, userService, cardGroupService, roleService)
 
 			input := model.UpsertDictionary{
 				Dictionary: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf(`
@@ -2161,25 +2161,25 @@ New Front 2 裏面２
 			})
 
 			// Expected response structure
-			expected := `{
-	"data": {
-		"upsertDictionary": {
-			"nodes": [{
-				"id": "1",
-				"front": "New Front 1",
-				"back": "裏面１",
-				"interval_days": 1,
-				"cardGroupID": 1
-			}, {
-				"id": "2",
-				"front": "New Front 2",
-				"back": "裏面２",
-				"interval_days": 1,
-				"cardGroupID": 1
-			}]
-		}
-	}
-}`
+			expected := fmt.Sprintf(`{
+    "data": {
+        "upsertDictionary": {
+            "nodes": [{
+                "id": "1",
+                "front": "New Front 1",
+                "back": "裏面１",
+                "interval_days": 1,
+                "cardGroupID": %d
+            }, {
+                "id": "2",
+                "front": "New Front 2",
+                "back": "裏面２",
+                "interval_days": 1,
+                "cardGroupID": %d
+            }]
+        }
+    }
+}`, createdGroup.ID, createdGroup.ID)
 
 			// Perform the GraphQL query and check the results
 			testGraphQLQuery(t, e, jsonInput, expected, "data.upsertDictionary.nodes.id")