mfnefd/domBudg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

0.2.0 #4

Merged
mfnefd merged 15 commits from dev into main 2024-12-11 04:42:35 +04:00
Conversation 0 Commits 15 Files Changed 31 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7139b67994 - Show all commits

2
back/Infrastructure/Repositories/SpendingGroupRepo.cs
View File

@ -70,7 +70,7 @@ public class SpendingGroupRepo : ISpendingGroupRepo
var group = await context.SpendingGroups var group = await context.SpendingGroups
.AsNoTracking() .AsNoTracking()
.Where(x => x.Id == plan.SpendingGroupId) .Where(x => x.Id == plan.SpendingGroupId)
.Include(x => x.ChangeRecords .Include(x => x.ChangeRecords!
// Выбираем из них только те, которые попадают в диапазон дат плана // Выбираем из них только те, которые попадают в диапазон дат плана
.Where(cg => cg.ChangedAt >= plan.StartAt && cg.ChangedAt <= plan.EndAt) .Where(cg => cg.ChangedAt >= plan.StartAt && cg.ChangedAt <= plan.EndAt)
// И сортируем их по дате // И сортируем их по дате

3
back/Infrastructure/Support/Mappers/ChangeRecordMapper.cs
View File

@ -12,7 +12,8 @@ public static class ChangeRecordMapper
Sum = changeRecord.Sum, Sum = changeRecord.Sum,
ChangedAt = changeRecord.ChangedAt, ChangedAt = changeRecord.ChangedAt,
SpendingGroupId = changeRecord.SpendingGroupId, SpendingGroupId = changeRecord.SpendingGroupId,
UserId = changeRecord.UserId UserId = changeRecord.UserId,
SpendingGroupName = changeRecord.SpendingGroup?.Name ?? string.Empty
}; };
public static ChangeRecord ToModel(this ChangeRecordDto changeRecord) public static ChangeRecord ToModel(this ChangeRecordDto changeRecord)