Merge branch 'main' of https://gits.altru.id/ESLOGAD/eslogad-backend
This commit is contained in:
commit
8aadb06d40
@ -734,8 +734,8 @@ func (p *LetterOutgoingProcessorImpl) ProcessRejection(ctx context.Context, lett
|
|||||||
for i := range allApprovals {
|
for i := range allApprovals {
|
||||||
// Only update other pending approvals from the same revision
|
// Only update other pending approvals from the same revision
|
||||||
if allApprovals[i].RevisionNumber == approval.RevisionNumber &&
|
if allApprovals[i].RevisionNumber == approval.RevisionNumber &&
|
||||||
allApprovals[i].ID != approval.ID &&
|
allApprovals[i].ID != approval.ID &&
|
||||||
allApprovals[i].Status == entities.ApprovalStatusPending {
|
allApprovals[i].Status == entities.ApprovalStatusPending {
|
||||||
allApprovals[i].Status = entities.ApprovalStatusRejected
|
allApprovals[i].Status = entities.ApprovalStatusRejected
|
||||||
if err := p.approvalRepo.Update(txCtx, &allApprovals[i]); err != nil {
|
if err := p.approvalRepo.Update(txCtx, &allApprovals[i]); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -821,6 +821,7 @@ func (p *LetterOutgoingProcessorImpl) ProcessRevision(ctx context.Context, lette
|
|||||||
ParallelGroup: approval.ParallelGroup,
|
ParallelGroup: approval.ParallelGroup,
|
||||||
IsRequired: approval.IsRequired,
|
IsRequired: approval.IsRequired,
|
||||||
Status: entities.ApprovalStatusPending,
|
Status: entities.ApprovalStatusPending,
|
||||||
|
ApproverID: approval.ApproverID,
|
||||||
}
|
}
|
||||||
if err := p.approvalRepo.Create(txCtx, &newApproval); err != nil {
|
if err := p.approvalRepo.Create(txCtx, &newApproval); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user