fix: mikro orm tasks statistics for teamId filters

ever-co · Apr 30, 2024 · be29149 · be29149
1 parent 96f1c10
commit be29149
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/packages/core/src/time-tracking/statistic/statistic.service.ts b/packages/core/src/time-tracking/statistic/statistic.service.ts
@@ -913,16 +913,13 @@ export class StatisticService {
 				if (isNotEmpty(taskIds)) {
 					sq.whereIn(`${qb.alias}.taskId`, taskIds);
 				}
-				if (isNotEmpty(organizationTeamId)) {
-					sq.andWhere(`${qb.alias}.organizationTeamId`, organizationTeamId);
-				}
 				if (isNotEmpty(organizationTeamId) || isNotEmpty(teamIds)) {
-					sq.andWhere(() => {
+					sq.andWhere(function () {
 						if (isNotEmpty(organizationTeamId)) {
-							sq.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
+							this.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
 						}
 						if (isNotEmpty(teamIds)) {
-							sq.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
+							this.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
 						}
 					});
 				}
@@ -1037,12 +1034,12 @@ export class StatisticService {
 					sq.whereIn(`${qb.alias}.taskId`, taskIds);
 				}
 				if (isNotEmpty(organizationTeamId) || isNotEmpty(teamIds)) {
-					sq.andWhere(() => {
+					sq.andWhere(function () {
 						if (isNotEmpty(organizationTeamId)) {
-							sq.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
+							this.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
 						}
 						if (isNotEmpty(teamIds)) {
-							sq.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
+							this.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
 						}
 					});
 				}
@@ -1149,12 +1146,12 @@ export class StatisticService {
 					sq.whereIn(`${qb.alias}.projectId`, projectIds);
 				}
 				if (isNotEmpty(organizationTeamId) || isNotEmpty(teamIds)) {
-					sq.andWhere(() => {
+					sq.andWhere(function () {
 						if (isNotEmpty(organizationTeamId)) {
-							sq.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
+							this.orWhere(`${qb.alias}.organizationTeamId`, '=', organizationTeamId);
 						}
 						if (isNotEmpty(teamIds)) {
-							sq.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
+							this.orWhereIn(`${qb.alias}.organizationTeamId`, teamIds);
 						}
 					});
 				}