Skip to content

Commit ec52210

Browse files
committed
Iterate on getByDate
1 parent b5675f6 commit ec52210

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/components/periodic-report/periodic-report.edgedb.repository.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Query } from 'cypher-query-builder';
33
import { Without } from 'type-fest/source/merge-exclusive';
44
import {
55
CalendarDate,
6+
EnhancedResource,
67
ID,
78
PublicOf,
89
Range,
@@ -57,26 +58,30 @@ export class PeriodicReportEdgeDBRepository
5758
throw new Error('Method not implemented.');
5859
}
5960

60-
getByDate(
61+
async getByDate(
6162
parentId: ID,
6263
date: CalendarDate,
6364
reportType: ReportType,
6465
_session: Session,
6566
) {
66-
const resource = e.cast(e.Resource, e.uuid(parentId));
67+
const enhancedResource = EnhancedResource.of(
68+
resolveReportType({ type: reportType }),
69+
);
70+
const resource = e.cast(enhancedResource.db, e.uuid(parentId));
6771

68-
const report = e.select(e.PeriodicReport, (report) => ({
72+
const report = e.select(resource, (report) => ({
6973
filter: e.all(
7074
e.set(
7175
e.op(resource.id, '=', report.container.id),
7276
e.op(report.start, '<=', date),
7377
e.op(report.end, '>=', date),
7478
),
7579
),
76-
...report.is(resolveReportType(reportType)),
7780
}));
7881

79-
return this.db.run(report);
82+
const query = e.select(report, this.hydrate);
83+
84+
return await this.db.run(query);
8085
}
8186

8287
getCurrentDue(

0 commit comments

Comments
 (0)