Skip to content

Commit 91b0970

Browse files
janisharjanishar
committed
improve imports
1 parent ef859c1 commit 91b0970

10 files changed

Lines changed: 76 additions & 76 deletions

File tree

‎.tools/apigen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import (
6161
"github.com/afteracademy/goserve-example-api-server-postgres/api/%s/dto"
6262
"github.com/afteracademy/goserve-example-api-server-postgres/api/%s/model"
6363
"github.com/afteracademy/goserve/v2/redis"
64-
"github.com/jackc/pgx/v5/pgxpool"
64+
"github.com/afteracademy/goserve/v2/postgres"
6565
"github.com/google/uuid"
6666
)
6767
@@ -70,11 +70,11 @@ type Service interface {
7070
}
7171
7272
type service struct {
73-
db *pgxpool.Pool
73+
db postgres.Database
7474
info%sCache redis.Cache[dto.Info%s]
7575
}
7676
77-
func NewService(db *pgxpool.Pool, store redis.Store) Service {
77+
func NewService(db postgres.Database, store redis.Store) Service {
7878
return &service{
7979
db: db,
8080
info%sCache: redis.NewCache[dto.Info%s](store),

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ import (
235235
"github.com/afteracademy/goserve-example-api-server-postgres/api/sample/dto"
236236
"github.com/afteracademy/goserve-example-api-server-postgres/api/sample/model"
237237
"github.com/afteracademy/goserve/v2/redis"
238-
"github.com/jackc/pgx/v5/pgxpool"
238+
"github.com/afteracademy/goserve/v2/postgres"
239239
"github.com/google/uuid"
240240
)
241241

@@ -244,11 +244,11 @@ type Service interface {
244244
}
245245

246246
type service struct {
247-
db *pgxpool.Pool
247+
db postgres.Database
248248
infoSampleCache redis.Cache[dto.InfoSample]
249249
}
250250

251-
func NewService(db *pgxpool.Pool, store redis.Store) Service {
251+
func NewService(db postgres.Database, store redis.Store) Service {
252252
return &service{
253253
db: db,
254254
infoSampleCache: redis.NewCache[dto.InfoSample](store),

‎api/auth/service.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/afteracademy/goserve-example-api-server-postgres/config"
1313
"github.com/afteracademy/goserve-example-api-server-postgres/utils"
1414
"github.com/afteracademy/goserve/v2/network"
15+
"github.com/afteracademy/goserve/v2/postgres"
1516
"github.com/afteracademy/goserve/v2/utility"
1617
"github.com/golang-jwt/jwt/v5"
1718
"github.com/google/uuid"
18-
"github.com/jackc/pgx/v5/pgxpool"
1919
"golang.org/x/crypto/bcrypt"
2020
)
2121

@@ -40,7 +40,7 @@ type Service interface {
4040
}
4141

4242
type service struct {
43-
db *pgxpool.Pool
43+
db postgres.Database
4444
userService user.Service
4545
// token
4646
rsaPrivateKey *rsa.PrivateKey
@@ -52,7 +52,7 @@ type service struct {
5252
}
5353

5454
func NewService(
55-
db *pgxpool.Pool,
55+
db postgres.Database,
5656
env *config.Env,
5757
userService user.Service,
5858
) Service {
@@ -149,7 +149,7 @@ func (s *service) SignOut(keystore *model.Keystore) error {
149149
WHERE id = $1
150150
`
151151

152-
_, err := s.db.Exec(ctx, query, keystore.ID)
152+
_, err := s.db.Pool().Exec(ctx, query, keystore.ID)
153153
return err
154154
}
155155

@@ -290,7 +290,7 @@ func (s *service) CreateKeystore(
290290
updated_at
291291
`
292292

293-
err := s.db.QueryRow(
293+
err := s.db.Pool().QueryRow(
294294
ctx,
295295
query,
296296
client.ID,
@@ -331,7 +331,7 @@ func (s *service) FetchKeystore(
331331

332332
var ks model.Keystore
333333

334-
err := s.db.QueryRow(ctx, query, client.ID, primaryKey).
334+
err := s.db.Pool().QueryRow(ctx, query, client.ID, primaryKey).
335335
Scan(
336336
&ks.ID,
337337
&ks.UserID,
@@ -374,7 +374,7 @@ func (s *service) FindRefreshKeystore(
374374

375375
var ks model.Keystore
376376

377-
err := s.db.QueryRow(
377+
err := s.db.Pool().QueryRow(
378378
ctx,
379379
query,
380380
client.ID,
@@ -476,7 +476,7 @@ func (s *service) FetchApiKey(
476476

477477
var apiKey model.ApiKey
478478

479-
err := s.db.QueryRow(ctx, query, key).
479+
err := s.db.Pool().QueryRow(ctx, query, key).
480480
Scan(
481481
&apiKey.ID,
482482
&apiKey.Key,
@@ -523,7 +523,7 @@ func (s *service) CreateApiKey(
523523
updated_at
524524
`
525525

526-
err := s.db.QueryRow(
526+
err := s.db.Pool().QueryRow(
527527
ctx,
528528
query,
529529
key,
@@ -557,7 +557,7 @@ func (s *service) DeleteApiKey(
557557
WHERE id = $1
558558
`
559559

560-
tag, err := s.db.Exec(ctx, query, apiKey.ID)
560+
tag, err := s.db.Pool().Exec(ctx, query, apiKey.ID)
561561
if err != nil {
562562
return false, err
563563
}

‎api/blog/author/service.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/afteracademy/goserve-example-api-server-postgres/utils"
1313
coredto "github.com/afteracademy/goserve/v2/dto"
1414
"github.com/afteracademy/goserve/v2/network"
15+
"github.com/afteracademy/goserve/v2/postgres"
1516
"github.com/google/uuid"
16-
"github.com/jackc/pgx/v5/pgxpool"
1717
)
1818

1919
type Service interface {
@@ -28,11 +28,11 @@ type Service interface {
2828
}
2929

3030
type service struct {
31-
db *pgxpool.Pool
31+
db postgres.Database
3232
blogService blog.Service
3333
}
3434

35-
func NewService(db *pgxpool.Pool, blogService blog.Service) Service {
35+
func NewService(db postgres.Database, blogService blog.Service) Service {
3636
return &service{
3737
db: db,
3838
blogService: blogService,
@@ -85,7 +85,7 @@ func (s *service) CreateBlog(
8585
status
8686
`
8787

88-
err := s.db.QueryRow(
88+
err := s.db.Pool().QueryRow(
8989
ctx,
9090
query,
9191
d.Title,
@@ -138,7 +138,7 @@ func (s *service) UpdateBlog(
138138
var blogID uuid.UUID
139139
var currentSlug string
140140

141-
err := s.db.QueryRow(
141+
err := s.db.Pool().QueryRow(
142142
ctx,
143143
selectQuery,
144144
b.ID,
@@ -225,7 +225,7 @@ func (s *service) UpdateBlog(
225225

226226
args = append(args, blogID, author.ID)
227227

228-
tag, err := s.db.Exec(ctx, updateQuery, args...)
228+
tag, err := s.db.Pool().Exec(ctx, updateQuery, args...)
229229
if err != nil {
230230
return nil, err
231231
}
@@ -254,7 +254,7 @@ func (s *service) DeactivateBlog(
254254
AND status = TRUE
255255
`
256256

257-
tag, err := s.db.Exec(
257+
tag, err := s.db.Pool().Exec(
258258
ctx,
259259
query,
260260
blogID,
@@ -289,7 +289,7 @@ func (s *service) BlogSubmission(
289289
AND status = TRUE
290290
`
291291

292-
tag, err := s.db.Exec(
292+
tag, err := s.db.Pool().Exec(
293293
ctx,
294294
query,
295295
submit,
@@ -341,7 +341,7 @@ func (s *service) GetBlogById(
341341

342342
var b model.Blog
343343

344-
err := s.db.QueryRow(ctx, query, id, author.ID).
344+
err := s.db.Pool().QueryRow(ctx, query, id, author.ID).
345345
Scan(
346346
&b.ID,
347347
&b.Title,
@@ -450,7 +450,7 @@ func (s *service) getPaginated(
450450
ctx := context.Background()
451451
offset := (p.Page - 1) * p.Limit
452452

453-
rows, err := s.db.Query(ctx, query, author.ID, p.Limit, offset)
453+
rows, err := s.db.Pool().Query(ctx, query, author.ID, p.Limit, offset)
454454
if err != nil {
455455
return nil, err
456456
}

‎api/blog/editor/service.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/afteracademy/goserve-example-api-server-postgres/api/user"
1111
coredto "github.com/afteracademy/goserve/v2/dto"
1212
"github.com/afteracademy/goserve/v2/network"
13+
"github.com/afteracademy/goserve/v2/postgres"
1314
"github.com/google/uuid"
1415
"github.com/jackc/pgx/v5"
15-
"github.com/jackc/pgx/v5/pgxpool"
1616
)
1717

1818
type Service interface {
@@ -23,11 +23,11 @@ type Service interface {
2323
}
2424

2525
type service struct {
26-
db *pgxpool.Pool
26+
db postgres.Database
2727
userService user.Service
2828
}
2929

30-
func NewService(db *pgxpool.Pool, userService user.Service) Service {
30+
func NewService(db postgres.Database, userService user.Service) Service {
3131
return &service{
3232
db: db,
3333
userService: userService,
@@ -60,7 +60,7 @@ func (s *service) BlogPublication(
6060
publishedAt *time.Time
6161
)
6262

63-
err := s.db.QueryRow(
63+
err := s.db.Pool().QueryRow(
6464
ctx,
6565
selectQuery,
6666
blogID,
@@ -130,7 +130,7 @@ func (s *service) BlogPublication(
130130
text = nil
131131
}
132132

133-
tag, err := s.db.Exec(
133+
tag, err := s.db.Pool().Exec(
134134
ctx,
135135
updateQuery,
136136
!publish,
@@ -180,7 +180,7 @@ func (s *service) GetBlogById(id uuid.UUID) (*dto.BlogPrivate, error) {
180180

181181
var b model.Blog
182182

183-
err := s.db.QueryRow(ctx, query, id).
183+
err := s.db.Pool().QueryRow(ctx, query, id).
184184
Scan(
185185
&b.ID,
186186
&b.Title,
@@ -264,7 +264,7 @@ func (s *service) getPaginated(
264264
ctx := context.Background()
265265
offset := (p.Page - 1) * p.Limit
266266

267-
rows, err := s.db.Query(ctx, query, p.Limit, offset)
267+
rows, err := s.db.Pool().Query(ctx, query, p.Limit, offset)
268268
if err != nil {
269269
return nil, err
270270
}

‎api/blog/service.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"github.com/afteracademy/goserve-example-api-server-postgres/api/blog/model"
1010
"github.com/afteracademy/goserve-example-api-server-postgres/api/user"
1111
"github.com/afteracademy/goserve/v2/network"
12+
"github.com/afteracademy/goserve/v2/postgres"
1213
"github.com/afteracademy/goserve/v2/redis"
1314
"github.com/google/uuid"
1415
"github.com/jackc/pgx/v5"
15-
"github.com/jackc/pgx/v5/pgxpool"
1616
)
1717

1818
type Service interface {
@@ -26,12 +26,12 @@ type Service interface {
2626
}
2727

2828
type service struct {
29-
db *pgxpool.Pool
29+
db postgres.Database
3030
publicBlogCache redis.Cache[dto.BlogPublic]
3131
userService user.Service
3232
}
3333

34-
func NewService(db *pgxpool.Pool, store redis.Store, userService user.Service) Service {
34+
func NewService(db postgres.Database, store redis.Store, userService user.Service) Service {
3535
return &service{
3636
db: db,
3737
publicBlogCache: redis.NewCache[dto.BlogPublic](store),
@@ -70,7 +70,7 @@ func (s *service) BlogSlugExists(slug string) bool {
7070
`
7171

7272
var exists bool
73-
err := s.db.QueryRow(context.Background(), query, slug).Scan(&exists)
73+
err := s.db.Pool().QueryRow(context.Background(), query, slug).Scan(&exists)
7474
if err != nil {
7575
return false
7676
}
@@ -101,7 +101,7 @@ func (s *service) GetPublisedBlogById(blogID uuid.UUID) (*dto.BlogPublic, error)
101101

102102
var b model.Blog
103103

104-
err := s.db.QueryRow(
104+
err := s.db.Pool().QueryRow(
105105
ctx,
106106
query,
107107
blogID,
@@ -156,7 +156,7 @@ func (s *service) GetPublishedBlogBySlug(slug string) (*dto.BlogPublic, error) {
156156

157157
var b model.Blog
158158

159-
err := s.db.QueryRow(
159+
err := s.db.Pool().QueryRow(
160160
ctx,
161161
query,
162162
slug,

0 commit comments

Comments
 (0)