Fixes + stable gateway ids

api/billing/documents/storage/model/document.go

@@ -28,6 +28,7 @@ func DocumentTypeFromProto(t documentsv1.DocumentType) DocumentType {
 	if name, ok := documentsv1.DocumentType_name[int32(t)]; ok {
 		return DocumentType(name)
 	}
+
 	return DocumentTypeUnspecified
 }
 
@@ -36,22 +37,24 @@ func (t DocumentType) Proto() documentsv1.DocumentType {
 	if value, ok := documentsv1.DocumentType_value[string(t)]; ok {
 		return documentsv1.DocumentType(value)
 	}
+
 	return documentsv1.DocumentType_DOCUMENT_TYPE_UNSPECIFIED
 }
 
 // ActSnapshot captures the immutable data needed to generate an acceptance act.
 type ActSnapshot struct {
-	PaymentID        string          `bson:"paymentId" json:"paymentId"`
-	Date             time.Time       `bson:"date" json:"date"`
+	PaymentID        string          `bson:"paymentId"        json:"paymentId"`
+	Date             time.Time       `bson:"date"             json:"date"`
 	ExecutorFullName string          `bson:"executorFullName" json:"executorFullName"`
-	Amount           decimal.Decimal `bson:"amount" json:"amount"`
-	Currency         string          `bson:"currency" json:"currency"`
+	Amount           decimal.Decimal `bson:"amount"           json:"amount"`
+	Currency         string          `bson:"currency"         json:"currency"`
 }
 
 func (s *ActSnapshot) Normalize() {
 	if s == nil {
 		return
 	}
+
 	s.PaymentID = strings.TrimSpace(s.PaymentID)
 	s.ExecutorFullName = strings.TrimSpace(s.ExecutorFullName)
 	s.Currency = strings.TrimSpace(s.Currency)
@@ -60,21 +63,25 @@ func (s *ActSnapshot) Normalize() {
 // DocumentRecord stores document metadata and cached artefacts for a payment.
 type DocumentRecord struct {
 	storable.Base `bson:",inline" json:",inline"`
-	PaymentRef    string                  `bson:"paymentRef" json:"paymentRef"`
-	Snapshot      ActSnapshot             `bson:"snapshot" json:"snapshot"`
-	StoragePaths  map[DocumentType]string `bson:"storagePaths,omitempty" json:"storagePaths,omitempty"`
-	Hashes        map[DocumentType]string `bson:"hashes,omitempty" json:"hashes,omitempty"`
+
+	PaymentRef   string                  `bson:"paymentRef"             json:"paymentRef"`
+	Snapshot     ActSnapshot             `bson:"snapshot"               json:"snapshot"`
+	StoragePaths map[DocumentType]string `bson:"storagePaths,omitempty" json:"storagePaths,omitempty"`
+	Hashes       map[DocumentType]string `bson:"hashes,omitempty"       json:"hashes,omitempty"`
 }
 
 func (r *DocumentRecord) Normalize() {
 	if r == nil {
 		return
 	}
+
 	r.PaymentRef = strings.TrimSpace(r.PaymentRef)
 	r.Snapshot.Normalize()
+
 	if r.StoragePaths == nil {
 		r.StoragePaths = map[DocumentType]string{}
 	}
+
 	if r.Hashes == nil {
 		r.Hashes = map[DocumentType]string{}
 	}

api/billing/documents/storage/mongo/repository.go

@@ -43,17 +43,21 @@ func New(logger mlogger.Logger, conn *db.MongoConnection) (*Store, error) {
 
 	if err := result.Ping(ctx); err != nil {
 		result.logger.Error("Mongo ping failed during store init", zap.Error(err))
+
 		return nil, err
 	}
 
 	documentsStore, err := store.NewDocuments(result.logger, database)
 	if err != nil {
 		result.logger.Error("Failed to initialise documents store", zap.Error(err))
+
 		return nil, err
 	}
+
 	result.documents = documentsStore
 
 	result.logger.Info("Billing documents MongoDB storage initialised")
+
 	return result, nil
 }
 

api/billing/documents/storage/mongo/store/documents.go

@@ -39,6 +39,7 @@ func NewDocuments(logger mlogger.Logger, db *mongo.Database) (*Documents, error)
 	for _, def := range indexes {
 		if err := repo.CreateIndex(def); err != nil {
 			logger.Error("Failed to ensure documents index", zap.Error(err), zap.String("collection", repo.Collection()))
+
 			return nil, err
 		}
 	}
@@ -56,7 +57,9 @@ func (d *Documents) Create(ctx context.Context, record *model.DocumentRecord) er
 	if record == nil {
 		return merrors.InvalidArgument("documentsStore: nil record")
 	}
+
 	record.Normalize()
+
 	if record.PaymentRef == "" {
 		return merrors.InvalidArgument("documentsStore: empty paymentRef")
 	}
@@ -66,9 +69,12 @@ func (d *Documents) Create(ctx context.Context, record *model.DocumentRecord) er
 		if errors.Is(err, merrors.ErrDataConflict) {
 			return storage.ErrDuplicateDocument
 		}
+
 		return err
 	}
+
 	d.logger.Debug("Document record created", zap.String("payment_ref", record.PaymentRef))
+
 	return nil
 }
 
@@ -76,17 +82,21 @@ func (d *Documents) Update(ctx context.Context, record *model.DocumentRecord) er
 	if record == nil {
 		return merrors.InvalidArgument("documentsStore: nil record")
 	}
+
 	if record.ID.IsZero() {
 		return merrors.InvalidArgument("documentsStore: missing record id")
 	}
+
 	record.Normalize()
 	record.Update()
 	if err := d.repo.Update(ctx, record); err != nil {
 		if errors.Is(err, merrors.ErrNoData) {
 			return storage.ErrDocumentNotFound
 		}
+
 		return err
 	}
+
 	return nil
 }
 
@@ -101,8 +111,10 @@ func (d *Documents) GetByPaymentRef(ctx context.Context, paymentRef string) (*mo
 		if errors.Is(err, merrors.ErrNoData) {
 			return nil, storage.ErrDocumentNotFound
 		}
+
 		return nil, err
 	}
+
 	return entity, nil
 }
 
@@ -113,26 +125,34 @@ func (d *Documents) ListByPaymentRefs(ctx context.Context, paymentRefs []string)
 		if clean == "" {
 			continue
 		}
+
 		refs = append(refs, clean)
 	}
+
 	if len(refs) == 0 {
 		return []*model.DocumentRecord{}, nil
 	}
 
 	query := repository.Query().Comparison(repository.Field("paymentRef"), builder.In, refs)
 	records := make([]*model.DocumentRecord, 0)
+
 	decoder := func(cur *mongo.Cursor) error {
 		var rec model.DocumentRecord
 		if err := cur.Decode(&rec); err != nil {
 			d.logger.Warn("Failed to decode document record", zap.Error(err))
+
 			return err
 		}
+
 		records = append(records, &rec)
+
 		return nil
 	}
+
 	if err := d.repo.FindManyByFilter(ctx, query, decoder); err != nil {
 		return nil, err
 	}
+
 	return records, nil
 }