Merge pull request #123 from drypa/master

merge from master
drypa · Feb 3, 2024 · c206967 · c206967
2 parents fd86d0c + 86f341d
commit c206967
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 52 deletions.
diff --git a/api/inside/accounts.pb.go b/api/inside/accounts.pb.go
diff --git a/api/inside/accounts.proto b/api/inside/accounts.proto
@@ -30,8 +30,15 @@ message GetUsersResponse {
 
 message UserRegistrationRequest {
  int32 telegramId = 1;
+ string phoneNumber = 2;
 }
 
 message UserRegistrationResponse {
  string userId = 1;
-}
+}
+
+message PhoneVerificationRequest {
+ int32 telegramId = 1;
+ string code = 2;
+}
+
diff --git a/api/inside/contracts.pb.go b/api/inside/contracts.pb.go
diff --git a/api/inside/contracts.proto b/api/inside/contracts.proto
@@ -34,6 +34,10 @@ service InternalApi {
 
  }
 
+ rpc VerifyPhone(PhoneVerificationRequest) returns (ErrorResponse) {
+
+ }
+
  rpc GetFirstUnckeckedRequest (NoParams) returns (ReceiptRequest) {
 
  }

diff --git a/backend/receipts/processor.go b/backend/receipts/processor.go
@@ -63,6 +63,10 @@ func (p *Processor) GetRawReceipt(ctx context.Context, in *api.GetRawReceiptRepo
  log.Printf("receipt with QR '%s' is not loaded from nalog.ru API\n", qr)
  return nil, errors.New("raw receipt not found")
  }
+ if r == nil || r.Ticket == nil || r.Ticket.Document == nil || r.Ticket.Document.Receipt == nil {
+ log.Printf("receipt document '%s' absent\n", qr)
+ return nil, errors.New("receipt document absent")
+ }
 
  bytes, err := p.render.Receipt(r.Ticket.Document.Receipt)
  return &api.RawReceiptReport{

diff --git a/backend/render/render.go b/backend/render/render.go
@@ -40,7 +40,6 @@ func (r *Render) Receipt(receipt *nalogru.Receipt) ([]byte, error) {
  log.Printf("failed to render receipt %v\n", err)
  return nil, err
  }
- log.Println(tpl.String())
  return tpl.Bytes(), nil
 }