From c1aa8c4c7f5646f80780c8a5bbdb03f2cebfe434 Mon Sep 17 00:00:00 2001 From: DRypa Date: Tue, 22 Aug 2023 16:40:44 +0300 Subject: [PATCH] #70 processor moved to correct package --- backend/main.go | 2 +- backend/users/{login_url => }/processor.go | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) rename backend/users/{login_url => }/processor.go (90%) diff --git a/backend/main.go b/backend/main.go index 5b54720..c0efc5a 100644 --- a/backend/main.go +++ b/backend/main.go @@ -82,7 +82,7 @@ func main() { if err != nil { log.Fatalf("failed to load TLS keys: %v", err) } - var accountProcessor internal.AccountProcessor = login_url.NewProcessor(&userRepository, generator) + var accountProcessor internal.AccountProcessor = users.NewProcessor(&userRepository, generator) r := render.New(templatePath) var receiptProcessor internal.ReceiptProcessor = receipts.NewProcessor(&receiptRepository, r) diff --git a/backend/users/login_url/processor.go b/backend/users/processor.go similarity index 90% rename from backend/users/login_url/processor.go rename to backend/users/processor.go index 273c0b9..4bc9d5c 100644 --- a/backend/users/login_url/processor.go +++ b/backend/users/processor.go @@ -1,4 +1,4 @@ -package login_url +package users import ( "context" @@ -6,19 +6,18 @@ import ( "google.golang.org/grpc" "receipt_collector/device" nalogDevice "receipt_collector/nalogru/device" - "receipt_collector/users" "time" ) // Processor provides method to return login link. type Processor struct { - repository *users.Repository - linkGenerator users.LinkGenerator + repository *Repository + linkGenerator LinkGenerator d *device.Service } // NewProcessor constructs Processor. -func NewProcessor(repository *users.Repository, linkGenerator users.LinkGenerator) *Processor { +func NewProcessor(repository *Repository, linkGenerator LinkGenerator) *Processor { return &Processor{repository: repository, linkGenerator: linkGenerator} } @@ -41,6 +40,7 @@ func (p Processor) GetLoginLink(ctx context.Context, in *api.GetLoginLinkRequest }, nil } +// GetUsers returns all registered users. func (p Processor) GetUsers(ctx context.Context, req *api.NoParams) (*api.GetUsersResponse, error) { all, err := p.repository.GetAll(ctx) if err != nil { @@ -105,12 +105,13 @@ func (p Processor) RegisterUser(ctx context.Context, in *api.UserRegistrationReq if err != nil { return nil, err } + //TODO: send request: POST https://irkkt-mobile.nalog.ru:8888/v2/auth/phone/request } return &api.UserRegistrationResponse{UserId: userId}, nil } -func (p Processor) addNewUser(ctx context.Context, telegramId int) (*users.User, error) { - u := users.User{ +func (p Processor) addNewUser(ctx context.Context, telegramId int) (*User, error) { + u := User{ TelegramId: telegramId, } err := p.repository.Insert(ctx, &u)