実装を直してテストを追加

azuki774 · Nov 21, 2023 · f79d6d7 · f79d6d7
1 parent 2cf4547
commit f79d6d7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 21 deletions.
diff --git a/internal/api/v2/service.go b/internal/api/v2/service.go
@@ -181,7 +181,7 @@ func (a *APIService) GetYYYYMMRecords(ctx context.Context, yyyymm string, params
 
 	// from
 	for _, r := range recRawExt1 {
-		if params.CategoryId == nil || (r.CategoryId == *params.CategoryId) {
+		if params.From == nil || (r.From == *params.From) {
 			recRawExt2 = append(recRawExt2, r)
 		}
 	}

diff --git a/internal/api/v2/service_test.go b/internal/api/v2/service_test.go
@@ -369,6 +369,33 @@ func TestAPIService_GetYYYYMMRecords(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "ok(params from)",
+			fields: fields{
+				Logger: l,
+				Repo:   &mockRepo{},
+			},
+			args: args{
+				ctx:    context.Background(),
+				yyyymm: "200001",
+				params: openapi.GetV2RecordYyyymmParams{
+					From: strPtr("mawinter-web"),
+				},
+			},
+			wantRecs: []openapi.Record{
+				{
+					CategoryId:   200,
+					CategoryName: "cat2",
+					Datetime:     time.Date(2000, 1, 25, 0, 0, 0, 0, jst),
+					From:         "mawinter-web",
+					Id:           2,
+					Memo:         "",
+					Price:        2345,
+					Type:         "",
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "ok(not found)",
 			fields: fields{

diff --git a/test/e2e.py b/test/e2e.py
@@ -146,6 +146,34 @@
     print(response.status_code)
     sys.exit(1)
 
+print("# get records with record 200004 from")
+url = "http://localhost:8080/v2/record/200004?from=testfrom2"
+response = requests.get(url)
+if response.status_code == 200:
+    json_data = response.json()
+    want = [
+        {
+            "category_id": 200,
+            "category_name": "家賃",
+            "id": 2,
+            "datetime": "2000-04-15T00:00:00+09:00",
+            "from": "testfrom2",
+            "type": "",
+            "price": 2000,
+            "memo": "",
+        }
+    ]
+    if want != json_data:
+        print("[NG] {}".format(url))
+        print(json_data)
+        print(want)
+        sys.exit(1)
+    print("[OK] {}".format(url))
+else:
+    print("[NG] {}".format(url))
+    print(response.status_code)
+    sys.exit(1)
+
 print("# get records with category_id (not found)")
 url = "http://localhost:8080/v2/record/200004?category_id=999"
 response = requests.get(url)
@@ -512,10 +540,7 @@
 response = requests.get(url)
 if response.status_code == 200:
     json_data = response.json()
-    want = {
-        "yyyymm": "200007",
-        "status": False
-    }
+    want = {"yyyymm": "200007", "status": False}
     if want != json_data:
         print("[NG] {}".format(url))
         print(json_data)
@@ -538,7 +563,9 @@
     want = {
         "yyyymm": "200007",
         "status": True,
-        "confirm_datetime": json_data["confirm_datetime"] # confirm_datetime の細かい日付は比較しないようにする
+        "confirm_datetime": json_data[
+            "confirm_datetime"
+        ],  # confirm_datetime の細かい日付は比較しないようにする
     }
 
     if want != json_data:
@@ -557,7 +584,7 @@
 data1 = '{"category_id": 100, "datetime": "20000712", "from": "testfrom1", "type": "S1", "price": 10000, "memo": "fixed"}'
 headers = {"Content-Type": "application/json"}
 response = requests.post(url, data=data1, headers=headers)
-if response.status_code == 400: # Bad Requests because the table is confirmed
+if response.status_code == 400:  # Bad Requests because the table is confirmed
     print("[OK] {}".format(url))
 else:
     print("[NG] {}".format(url))
@@ -608,7 +635,7 @@
             "id": 8,
             "memo": "",
             "price": 3000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 200,
@@ -618,7 +645,7 @@
             "id": 7,
             "memo": "",
             "price": 2000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 100,
@@ -628,8 +655,8 @@
             "id": 6,
             "memo": "memo",
             "price": 1000,
-            "type": "S1"
-        }
+            "type": "S1",
+        },
     ]
     if want != json_data:
         print("[NG] {}".format(url))
@@ -656,7 +683,7 @@
             "id": 8,
             "memo": "",
             "price": 3000,
-            "type": ""
+            "type": "",
         }
     ]
     if want != json_data:
@@ -684,7 +711,7 @@
             "id": 8,
             "memo": "",
             "price": 3000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 200,
@@ -694,7 +721,7 @@
             "id": 7,
             "memo": "",
             "price": 2000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 100,
@@ -704,7 +731,7 @@
             "id": 6,
             "memo": "memo",
             "price": 1000,
-            "type": "S1"
+            "type": "S1",
         },
         {
             "category_id": 200,
@@ -714,7 +741,7 @@
             "id": 5,
             "memo": "memo2",
             "price": 2000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 100,
@@ -724,7 +751,7 @@
             "id": 4,
             "memo": "memo1",
             "price": 1000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 300,
@@ -734,7 +761,7 @@
             "id": 3,
             "memo": "",
             "price": 3000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 200,
@@ -744,7 +771,7 @@
             "id": 2,
             "memo": "",
             "price": 2000,
-            "type": ""
+            "type": "",
         },
         {
             "category_id": 100,
@@ -754,8 +781,8 @@
             "id": 1,
             "memo": "memo",
             "price": 1000,
-            "type": "S1"
-        }
+            "type": "S1",
+        },
     ]
     if want != json_data:
         print("[NG] {}".format(url))