#70 processor moved to correct package

drypa · Aug 22, 2023 · c1aa8c4 · c1aa8c4
1 parent 1963d13
commit c1aa8c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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 → backend/users/processor.go b/backend/users/login_url/processor.go → backend/users/processor.go
@@ -1,24 +1,23 @@
-package login_url
+package users
 
 import (
  "context"
  api "github.com/drypa/ReceiptCollector/api/inside"
  "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)