new_gate/ms-tester
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: move languages to submodule;fix:storage:replace postgres query with array query when getting language

Browse source
This commit is contained in:
dragonmuffin 2024-08-25 18:13:57 +05:00
parent 02a7a49ac3
commit 75acb422af
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,3 +1,4 @@
.env .env
.idea .idea
/pkg/go/gen /pkg/go/gen
/ms-tester

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "proto"] [submodule "proto"]
path = proto path = proto
url = https://git.sch9.ru/new_gate/contracts url = https://git.sch9.ru/new_gate/contracts
[submodule "internal/languages"]
path = internal/languages
url = https://git.sch9.ru/new_gate/languages

1
internal/languages Submodule

@ -0,0 +1 @@
Subproject commit e4171bacc4d22e80c91eab79f2b8140c2cdf4d95

6
internal/services/language.go
View file

@ -2,11 +2,11 @@ package services
import ( import (
"context" "context"
"git.sch9.ru/new_gate/ms-tester/internal/models" "git.sch9.ru/new_gate/ms-tester/internal/languages"
) )
type LanguageStorage interface { type LanguageStorage interface {
ReadLanguageById(ctx context.Context, id int32) (*models.Language, error) ReadLanguageById(ctx context.Context, id int32) (*languages.Language, error)
} }
type LanguageService struct { type LanguageService struct {
@ -21,7 +21,7 @@ func NewLanguageService(
} }
} }
func (service *LanguageService) ReadLanguageById(ctx context.Context, id int32) (*models.Language, error) { func (service *LanguageService) ReadLanguageById(ctx context.Context, id int32) (*languages.Language, error) {
//userId := ctx.Value("user_id").(int32) //userId := ctx.Value("user_id").(int32)
panic("access control is not implemented yet") panic("access control is not implemented yet")
return service.languageStorage.ReadLanguageById(ctx, id) return service.languageStorage.ReadLanguageById(ctx, id)

16
internal/storage/language.go
View file

@ -2,7 +2,8 @@ package storage
import ( import (
"context" "context"
"git.sch9.ru/new_gate/ms-tester/internal/models" "git.sch9.ru/new_gate/ms-tester/internal/languages"
"git.sch9.ru/new_gate/ms-tester/internal/lib"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -19,12 +20,9 @@ func NewLanguageStorage(db *sqlx.DB, logger *zap.Logger) *LanguageStorage {
} }
} }
func (storage *LanguageStorage) ReadLanguageById(ctx context.Context, id int32) (*models.Language, error) { func (storage *LanguageStorage) ReadLanguageById(ctx context.Context, id int32) (*languages.Language, error) {
var language models.Language if(id<=int32(len(languages.Languages))) {
query := storage.db.Rebind("SELECT * from languages WHERE id=? LIMIT 1") return nil,lib.StorageError(nil,lib.ErrNotFound,"language not found")
err := storage.db.GetContext(ctx, &language, query, id) }
if err != nil { return &languages.Languages[id], nil
return nil, handlePgErr(err)
}
return &language, nil
} }