xonecas.io
5011
Sp

scrap-paper / commit 5947930

tests: fix tests and update queries

Sean2025-03-25 5947930d5b4a692a346e0b3930fa47745e6bc1f1 parent 394e8a4

3 files changed

scrap-paper/migrations/1_create_schema.up.sql+1−1
@@ -2,7 +2,7 @@ CREATE TABLE users (
22 id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
33 email text NOT NULL UNIQUE,
44 password text NOT NULL,
5- token text,
5+ token text NOT NULL,
66 created_at timestamp with time zone DEFAULT now(),
77 updated_at timestamp with time zone DEFAULT now()
88 );
scrap-paper/storage.go+35−53
@@ -2,7 +2,6 @@ package scrap_paper
22
33 import (
44 "context"
5- "database/sql"
65 "time"
76 )
87
@@ -17,64 +16,57 @@ type ScrapPaper struct {
1716 Id string `json:"id"`
1817 Content string `json:"content"`
1918 IsPrivate bool `json:"is_private"`
19+ UserId string `json:"user_id"`
2020 CreatedAt time.Time `json:"created_at"`
2121 UpdatedAt time.Time `json:"updated_at"`
2222 }
2323
2424 func CreatePaper(ctx context.Context, scrapPaper *ScrapPaper) error {
25- result, err := pgsql.Query(ctx, `
26- INSERT INTO scrap_papers (content, is_private)
27- VALUES ($1, $2)
25+ row := pgsql.QueryRow(ctx, `
26+ INSERT INTO scrap_papers (content, is_private, user_id)
27+ VALUES ($1, $2, $3)
2828 ON CONFLICT (id) DO UPDATE SET
2929 content = $1,
30- is_private = $2
31- RETURNING id, content, is_private, created_at, updated_at
32- `, scrapPaper.Content, scrapPaper.IsPrivate)
30+ is_private = $2,
31+ user_id = $3
32+ RETURNING id, content, is_private, user_id, created_at, updated_at
33+ `, scrapPaper.Content, scrapPaper.IsPrivate, scrapPaper.UserId)
34+
35+ err := row.Scan(&scrapPaper.Id, &scrapPaper.Content, &scrapPaper.IsPrivate, &scrapPaper.UserId, &scrapPaper.CreatedAt, &scrapPaper.UpdatedAt)
36+
3337 if err != nil {
3438 return err
3539 }
3640
37- if result.Next() {
38- err = result.Scan(&scrapPaper.Id, &scrapPaper.Content, &scrapPaper.IsPrivate, &scrapPaper.CreatedAt, &scrapPaper.UpdatedAt)
39- if err != nil {
40- return err
41- }
42- } else {
43- return sql.ErrNoRows
44- }
45-
4641 return nil
4742 }
4843
4944 func GetPaper(ctx context.Context, scrapPaper *ScrapPaper) error {
50- result, err := pgsql.Query(ctx, `
51- SELECT id, content, is_private, created_at, updated_at
45+ row := pgsql.QueryRow(ctx, `
46+ SELECT id, content, is_private, user_id, created_at, updated_at
5247 FROM scrap_papers
5348 WHERE id = $1
5449 `, scrapPaper.Id)
50+
51+ err := row.Scan(&scrapPaper.Id, &scrapPaper.Content, &scrapPaper.IsPrivate, &scrapPaper.UserId, &scrapPaper.CreatedAt, &scrapPaper.UpdatedAt)
52+
5553 if err != nil {
5654 return err
5755 }
5856
59- if result.Next() {
60- err = result.Scan(&scrapPaper.Id, &scrapPaper.Content, &scrapPaper.IsPrivate, &scrapPaper.CreatedAt, &scrapPaper.UpdatedAt)
61- if err != nil {
62- return err
63- }
64- } else {
65- return sql.ErrNoRows
66- }
67-
6857 return nil
6958 }
7059
7160 func UpdatePaper(ctx context.Context, scrapPaper *ScrapPaper) error {
72- _, err := pgsql.Query(ctx, `
61+ row := pgsql.QueryRow(ctx, `
7362 UPDATE scrap_papers
7463 SET content = $1, is_private = $2
7564 WHERE id = $3
65+ RETURNING id, content, is_private, user_id, created_at, updated_at
7666 `, scrapPaper.Content, scrapPaper.IsPrivate, scrapPaper.Id)
7767
68+ err := row.Scan(&scrapPaper.Id, &scrapPaper.Content, &scrapPaper.IsPrivate, &scrapPaper.UserId, &scrapPaper.CreatedAt, &scrapPaper.UpdatedAt)
69+
7870 if err != nil {
7971 return err
8072 }
@@ -95,58 +87,48 @@ func DeletePaper(ctx context.Context, scrapPaper *ScrapPaper) error {
9587 }
9688
9789 func CreateUser(ctx context.Context, user *User) error {
98- result, err := pgsql.Query(ctx, `
99- INSERT INTO users (email, password)
100- VALUES ($1, $2)
101- RETURNING id, email, password
102- `, user.Email, user.Password)
90+ row := pgsql.QueryRow(ctx, `
91+ INSERT INTO users (email, password, token)
92+ VALUES ($1, $2, $3)
93+ RETURNING id, email, password, token
94+ `, user.Email, user.Password, user.Token)
95+
96+ err := row.Scan(&user.ID, &user.Email, &user.Password, &user.Token)
10397 if err != nil {
10498 return err
10599 }
106100
107- if result.Next() {
108- err = result.Scan(&user.ID, &user.Email, &user.Password)
109- if err != nil {
110- return err
111- }
112- } else {
113- return sql.ErrNoRows
114- }
115-
116101 return nil
117102 }
118103
119104 func GetUser(ctx context.Context, user *User) error {
120- result, err := pgsql.Query(ctx, `
105+ row := pgsql.QueryRow(ctx, `
121106 SELECT id, email, password, token
122107 FROM users
123108 WHERE id = $1
124109 `, user.ID)
110+
111+ err := row.Scan(&user.ID, &user.Email, &user.Password, &user.Token)
125112 if err != nil {
126113 return err
127114 }
128115
129- if result.Next() {
130- err = result.Scan(&user.ID, &user.Email, &user.Password, &user.Token)
131- if err != nil {
132- return err
133- }
134- } else {
135- return sql.ErrNoRows
136- }
137-
138116 return nil
139117 }
140118
141119 func UpdateUser(ctx context.Context, user *User) error {
142- _, err := pgsql.Exec(ctx, `
120+ row := pgsql.QueryRow(ctx, `
143121 UPDATE users
144122 SET email = $1, password = $2, token = $3
145123 WHERE id = $4
124+ RETURNING id, email, password, token
146125 `, user.Email, user.Password, user.Token, user.ID)
126+
127+ err := row.Scan(&user.ID, &user.Email, &user.Password, &user.Token)
147128 if err != nil {
148129 return err
149130 }
131+
150132 return nil
151133 }
152134
scrap-paper/storage_test.go+91−79
@@ -2,90 +2,12 @@ package scrap_paper_test
22
33 import (
44 "context"
5- "database/sql"
65 "testing"
76
87 scrap_paper "encore.app/scrap-paper"
98 "encore.dev/et"
109 )
1110
12-func TestScrapPaperCRUD(t *testing.T) {
13- ctx := context.Background()
14-
15- if _, err := et.NewTestDatabase(ctx, "scrap_paper"); err != nil {
16- t.Fatalf("failed to create test database: %v", err)
17- }
18-
19- scrapPaper := &scrap_paper.ScrapPaper{
20- Content: "Hello test, test.",
21- IsPrivate: false,
22- }
23-
24- t.Run("Create", func(t *testing.T) {
25- err := scrap_paper.CreatePaper(ctx, scrapPaper)
26- if err != nil {
27- t.Fatalf("failed to create scrap paper: %v", err)
28- }
29-
30- if scrapPaper.Id == "" {
31- t.Fatalf("scrap paper id is empty")
32- }
33-
34- if scrapPaper.Content != "Hello test, test." {
35- t.Fatalf("scrap paper content is not Hello test, test.: %v", scrapPaper.Content)
36- }
37-
38- if scrapPaper.IsPrivate != false {
39- t.Fatalf("scrap paper private is not false: %v", scrapPaper.IsPrivate)
40- }
41- })
42-
43- t.Run("Get", func(t *testing.T) {
44- err := scrap_paper.GetPaper(ctx, scrapPaper)
45- if err != nil {
46- t.Fatalf("failed to get scrap paper: %v", err)
47- }
48-
49- if scrapPaper.Id == "" {
50- t.Fatalf("scrap paper id is empty")
51- }
52-
53- if scrapPaper.Content != "Hello test, test." {
54- t.Fatalf("scrap paper content is not Hello test, test.: %v", scrapPaper.Content)
55- }
56-
57- if scrapPaper.IsPrivate != false {
58- t.Fatalf("scrap paper private is not false: %v", scrapPaper.IsPrivate)
59- }
60- })
61-
62- t.Run("Update", func(t *testing.T) {
63- scrapPaper.Content = "Hello test, test. updated."
64- err := scrap_paper.UpdatePaper(ctx, scrapPaper)
65- if err != nil {
66- t.Fatalf("failed to update scrap paper: %v", err)
67- }
68-
69- if scrapPaper.Content != "Hello test, test. updated." {
70- t.Fatalf("scrap paper content is not Hello test, test. updated.: %v", scrapPaper.Content)
71- }
72- })
73-
74- t.Run("Delete", func(t *testing.T) {
75- err := scrap_paper.DeletePaper(ctx, scrapPaper)
76- if err != nil {
77- t.Fatalf("failed to delete scrap paper: %v", err)
78- }
79-
80- deleted := scrap_paper.ScrapPaper{}
81- err = scrap_paper.GetPaper(ctx, &deleted)
82-
83- if err != sql.ErrNoRows {
84- t.Fatalf("Row should not be found: %v", err)
85- }
86- })
87-}
88-
8911 func TestUserCRUD(t *testing.T) {
9012 ctx := context.Background()
9113
@@ -96,6 +18,7 @@ func TestUserCRUD(t *testing.T) {
9618 user := &scrap_paper.User{
9719 Email: "test@test.com",
9820 Password: "password",
21+ Token: "",
9922 }
10023
10124 t.Run("Create", func(t *testing.T) {
@@ -180,7 +103,96 @@ func TestUserCRUD(t *testing.T) {
180103 deleted.ID = user.ID
181104
182105 err = scrap_paper.GetUser(ctx, deleted)
183- if err != sql.ErrNoRows {
106+
107+ if err == nil {
108+ t.Fatalf("Row should not be found: %v", err)
109+ }
110+ })
111+}
112+
113+func TestScrapPaperCRUD(t *testing.T) {
114+ ctx := context.Background()
115+
116+ if _, err := et.NewTestDatabase(ctx, "scrap_paper"); err != nil {
117+ t.Fatalf("failed to create test database: %v", err)
118+ }
119+
120+ user := &scrap_paper.User{
121+ Email: "test@test.com",
122+ Password: "password",
123+ Token: "",
124+ }
125+ err := scrap_paper.CreateUser(ctx, user)
126+ if err != nil {
127+ t.Fatalf("failed to create user: %v", err)
128+ }
129+
130+ scrapPaper := &scrap_paper.ScrapPaper{
131+ Content: "Hello test, test.",
132+ IsPrivate: false,
133+ UserId: user.ID,
134+ }
135+
136+ t.Run("Create", func(t *testing.T) {
137+ err := scrap_paper.CreatePaper(ctx, scrapPaper)
138+ if err != nil {
139+ t.Fatalf("failed to create scrap paper: %v", err)
140+ }
141+
142+ if scrapPaper.Id == "" {
143+ t.Fatalf("scrap paper id is empty")
144+ }
145+
146+ if scrapPaper.Content != "Hello test, test." {
147+ t.Fatalf("scrap paper content is not Hello test, test.: %v", scrapPaper.Content)
148+ }
149+
150+ if scrapPaper.IsPrivate != false {
151+ t.Fatalf("scrap paper private is not false: %v", scrapPaper.IsPrivate)
152+ }
153+ })
154+
155+ t.Run("Get", func(t *testing.T) {
156+ err := scrap_paper.GetPaper(ctx, scrapPaper)
157+ if err != nil {
158+ t.Fatalf("failed to get scrap paper: %v", err)
159+ }
160+
161+ if scrapPaper.Id == "" {
162+ t.Fatalf("scrap paper id is empty")
163+ }
164+
165+ if scrapPaper.Content != "Hello test, test." {
166+ t.Fatalf("scrap paper content is not Hello test, test.: %v", scrapPaper.Content)
167+ }
168+
169+ if scrapPaper.IsPrivate != false {
170+ t.Fatalf("scrap paper private is not false: %v", scrapPaper.IsPrivate)
171+ }
172+ })
173+
174+ t.Run("Update", func(t *testing.T) {
175+ scrapPaper.Content = "Hello test, test. updated."
176+ err := scrap_paper.UpdatePaper(ctx, scrapPaper)
177+ if err != nil {
178+ t.Fatalf("failed to update scrap paper: %v", err)
179+ }
180+
181+ if scrapPaper.Content != "Hello test, test. updated." {
182+ t.Fatalf("scrap paper content is not Hello test, test. updated.: %v", scrapPaper.Content)
183+ }
184+ })
185+
186+ t.Run("Delete", func(t *testing.T) {
187+ err := scrap_paper.DeletePaper(ctx, scrapPaper)
188+ if err != nil {
189+ t.Fatalf("failed to delete scrap paper: %v", err)
190+ }
191+
192+ deleted := scrap_paper.ScrapPaper{}
193+ err = scrap_paper.GetPaper(ctx, &deleted)
194+
195+ if err == nil {
184196 t.Fatalf("Row should not be found: %v", err)
185197 }
186198 })