idempotency key usage fix
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
ri "github.com/tech/sendico/pkg/db/repository/index"
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.uber.org/zap"
|
||||
@@ -87,14 +88,14 @@ func (a *accountsStore) Get(ctx context.Context, accountRef primitive.ObjectID)
|
||||
result := &model.Account{}
|
||||
if err := a.repo.Get(ctx, accountRef, result); err != nil {
|
||||
if errors.Is(err, merrors.ErrNoData) {
|
||||
a.logger.Debug("account not found", zap.String("accountRef", accountRef.Hex()))
|
||||
a.logger.Debug("account not found", mzap.ObjRef("account_ref", accountRef))
|
||||
return nil, storage.ErrAccountNotFound
|
||||
}
|
||||
a.logger.Warn("failed to get account", zap.Error(err), zap.String("accountRef", accountRef.Hex()))
|
||||
a.logger.Warn("failed to get account", zap.Error(err), mzap.ObjRef("account_ref", accountRef))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
a.logger.Debug("account loaded", zap.String("accountRef", accountRef.Hex()),
|
||||
a.logger.Debug("account loaded", mzap.ObjRef("account_ref", accountRef),
|
||||
zap.String("accountCode", result.AccountCode))
|
||||
return result, nil
|
||||
}
|
||||
@@ -156,11 +157,11 @@ func (a *accountsStore) GetDefaultSettlement(ctx context.Context, orgRef primiti
|
||||
if errors.Is(err, merrors.ErrNoData) {
|
||||
a.logger.Debug("default settlement account not found",
|
||||
zap.String("currency", currency),
|
||||
zap.String("organizationRef", orgRef.Hex()))
|
||||
mzap.ObjRef("organization_ref", orgRef))
|
||||
return nil, storage.ErrAccountNotFound
|
||||
}
|
||||
a.logger.Warn("failed to get default settlement account", zap.Error(err),
|
||||
zap.String("organizationRef", orgRef.Hex()),
|
||||
mzap.ObjRef("organization_ref", orgRef),
|
||||
zap.String("currency", currency))
|
||||
return nil, err
|
||||
}
|
||||
@@ -210,11 +211,11 @@ func (a *accountsStore) UpdateStatus(ctx context.Context, accountRef primitive.O
|
||||
|
||||
patch := repository.Patch().Set(repository.Field("status"), status)
|
||||
if err := a.repo.Patch(ctx, accountRef, patch); err != nil {
|
||||
a.logger.Warn("failed to update account status", zap.Error(err), zap.String("accountRef", accountRef.Hex()))
|
||||
a.logger.Warn("failed to update account status", zap.Error(err), mzap.ObjRef("account_ref", accountRef))
|
||||
return err
|
||||
}
|
||||
|
||||
a.logger.Debug("account status updated", zap.String("accountRef", accountRef.Hex()),
|
||||
a.logger.Debug("account status updated", mzap.ObjRef("account_ref", accountRef),
|
||||
zap.String("status", string(status)))
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
ri "github.com/tech/sendico/pkg/db/repository/index"
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.uber.org/zap"
|
||||
@@ -55,14 +56,14 @@ func (b *balancesStore) Get(ctx context.Context, accountRef primitive.ObjectID)
|
||||
result := &model.AccountBalance{}
|
||||
if err := b.repo.FindOneByFilter(ctx, query, result); err != nil {
|
||||
if errors.Is(err, merrors.ErrNoData) {
|
||||
b.logger.Debug("balance not found", zap.String("accountRef", accountRef.Hex()))
|
||||
b.logger.Debug("balance not found", mzap.ObjRef("account_ref", accountRef))
|
||||
return nil, storage.ErrBalanceNotFound
|
||||
}
|
||||
b.logger.Warn("failed to get balance", zap.Error(err), zap.String("accountRef", accountRef.Hex()))
|
||||
b.logger.Warn("failed to get balance", zap.Error(err), mzap.ObjRef("account_ref", accountRef))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
b.logger.Debug("balance loaded", zap.String("accountRef", accountRef.Hex()),
|
||||
b.logger.Debug("balance loaded", mzap.ObjRef("account_ref", accountRef),
|
||||
zap.String("balance", result.Balance))
|
||||
return result, nil
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
ri "github.com/tech/sendico/pkg/db/repository/index"
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.uber.org/zap"
|
||||
@@ -65,14 +66,14 @@ func (j *journalEntriesStore) Create(ctx context.Context, entry *model.JournalEn
|
||||
|
||||
if err := j.repo.Insert(ctx, entry, nil); err != nil {
|
||||
if mongo.IsDuplicateKeyError(err) {
|
||||
j.logger.Warn("duplicate idempotency key", zap.String("idempotencyKey", entry.IdempotencyKey))
|
||||
j.logger.Warn("duplicate idempotency key", zap.String("idempotency_key", entry.IdempotencyKey))
|
||||
return storage.ErrDuplicateIdempotency
|
||||
}
|
||||
j.logger.Warn("failed to create journal entry", zap.Error(err))
|
||||
return err
|
||||
}
|
||||
|
||||
j.logger.Debug("journal entry created", zap.String("idempotencyKey", entry.IdempotencyKey),
|
||||
j.logger.Debug("journal entry created", zap.String("idempotency_key", entry.IdempotencyKey),
|
||||
zap.String("entryType", string(entry.EntryType)))
|
||||
return nil
|
||||
}
|
||||
@@ -86,15 +87,15 @@ func (j *journalEntriesStore) Get(ctx context.Context, entryRef primitive.Object
|
||||
result := &model.JournalEntry{}
|
||||
if err := j.repo.Get(ctx, entryRef, result); err != nil {
|
||||
if errors.Is(err, merrors.ErrNoData) {
|
||||
j.logger.Debug("journal entry not found", zap.String("entryRef", entryRef.Hex()))
|
||||
j.logger.Debug("journal entry not found", mzap.ObjRef("entry_ref", entryRef))
|
||||
return nil, storage.ErrJournalEntryNotFound
|
||||
}
|
||||
j.logger.Warn("failed to get journal entry", zap.Error(err), zap.String("entryRef", entryRef.Hex()))
|
||||
j.logger.Warn("failed to get journal entry", zap.Error(err), mzap.ObjRef("entry_ref", entryRef))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
j.logger.Debug("journal entry loaded", zap.String("entryRef", entryRef.Hex()),
|
||||
zap.String("idempotencyKey", result.IdempotencyKey))
|
||||
j.logger.Debug("journal entry loaded", mzap.ObjRef("entry_ref", entryRef),
|
||||
zap.String("idempotency_key", result.IdempotencyKey))
|
||||
return result, nil
|
||||
}
|
||||
|
||||
@@ -115,15 +116,15 @@ func (j *journalEntriesStore) GetByIdempotencyKey(ctx context.Context, orgRef pr
|
||||
result := &model.JournalEntry{}
|
||||
if err := j.repo.FindOneByFilter(ctx, query, result); err != nil {
|
||||
if errors.Is(err, merrors.ErrNoData) {
|
||||
j.logger.Debug("journal entry not found by idempotency key", zap.String("idempotencyKey", idempotencyKey))
|
||||
j.logger.Debug("journal entry not found by idempotency key", zap.String("idempotency_key", idempotencyKey))
|
||||
return nil, storage.ErrJournalEntryNotFound
|
||||
}
|
||||
j.logger.Warn("failed to get journal entry by idempotency key", zap.Error(err),
|
||||
zap.String("idempotencyKey", idempotencyKey))
|
||||
zap.String("idempotency_key", idempotencyKey))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
j.logger.Debug("journal entry loaded by idempotency key", zap.String("idempotencyKey", idempotencyKey))
|
||||
j.logger.Debug("journal entry loaded by idempotency key", zap.String("idempotency_key", idempotencyKey))
|
||||
return result, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/tech/sendico/pkg/db/storable"
|
||||
"github.com/tech/sendico/pkg/merrors"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.uber.org/zap"
|
||||
@@ -97,11 +98,11 @@ func (p *postingLinesStore) ListByJournalEntry(ctx context.Context, entryRef pri
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
p.logger.Warn("failed to list posting lines by entry", zap.Error(err), zap.String("entryRef", entryRef.Hex()))
|
||||
p.logger.Warn("failed to list posting lines by entry", zap.Error(err), mzap.ObjRef("entry_ref", entryRef))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
p.logger.Debug("listed posting lines by entry", zap.Int("count", len(lines)), zap.String("entryRef", entryRef.Hex()))
|
||||
p.logger.Debug("listed posting lines by entry", zap.Int("count", len(lines)), mzap.ObjRef("entry_ref", entryRef))
|
||||
return lines, nil
|
||||
}
|
||||
|
||||
@@ -129,10 +130,10 @@ func (p *postingLinesStore) ListByAccount(ctx context.Context, accountRef primit
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
p.logger.Warn("failed to list posting lines by account", zap.Error(err), zap.String("accountRef", accountRef.Hex()))
|
||||
p.logger.Warn("failed to list posting lines by account", zap.Error(err), mzap.ObjRef("account_ref", accountRef))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
p.logger.Debug("listed posting lines by account", zap.Int("count", len(lines)), zap.String("accountRef", accountRef.Hex()))
|
||||
p.logger.Debug("listed posting lines by account", zap.Int("count", len(lines)), mzap.ObjRef("account_ref", accountRef))
|
||||
return lines, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user