-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1014 from parlemonde/feat/VIL-59
Feat/vil 59
- Loading branch information
Showing
13 changed files
with
474 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { | ||
| generateEmptyFilterParams, | ||
| getChildrenCodesCount, | ||
| getConnectedFamiliesCount, | ||
| getFamiliesWithoutAccount, | ||
| getFamilyAccountsCount, | ||
| getFloatingAccounts, | ||
| } from './queryStatsByFilter'; | ||
|
|
||
| export const getFamiliesWithoutAccountForGlobal = async () => { | ||
| return getFamiliesWithoutAccount(); | ||
| }; | ||
|
|
||
| export const getConnectedFamiliesCountForGlobal = async () => { | ||
| const filterParams = generateEmptyFilterParams(); | ||
| return getConnectedFamiliesCount(filterParams); | ||
| }; | ||
|
|
||
| export const getChildrenCodesCountForGlobal = async () => { | ||
| const filterParams = generateEmptyFilterParams(); | ||
| return await getChildrenCodesCount(filterParams); | ||
| }; | ||
| export const getFloatingAccountsForGlobal = async () => { | ||
| const filterParams = generateEmptyFilterParams(); | ||
| return await getFloatingAccounts(filterParams); | ||
| }; | ||
|
|
||
| export const getFamilyAccountsCountForGlobal = async () => { | ||
| const filterParams = generateEmptyFilterParams(); | ||
| return await getFamilyAccountsCount(filterParams); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| import type { StatsFilterParams } from '../../types/statistics.type'; | ||
| import { PhaseHistory } from '../entities/phaseHistory'; | ||
| import { Student } from '../entities/student'; | ||
| import { User } from '../entities/user'; | ||
| import { VillagePhase, Village } from '../entities/village'; | ||
| import { AppDataSource } from '../utils/data-source'; | ||
|
|
||
| const studentRepository = AppDataSource.getRepository(Student); | ||
| const villageRepository = AppDataSource.getRepository(Village); | ||
| const userRepository = AppDataSource.getRepository(User); | ||
| const phaseHistoryRepository = AppDataSource.getRepository(PhaseHistory); | ||
|
|
||
| export const getFamiliesWithoutAccount = async (condition?: string, conditionValue?: object) => { | ||
| const query = studentRepository | ||
| .createQueryBuilder('student') | ||
| .innerJoin('student.classroom', 'classroom') | ||
| .innerJoin('classroom.user', 'user') | ||
| .innerJoin('user.village', 'village') | ||
| .where('student.numLinkedAccount < 1'); | ||
|
|
||
| if (condition && conditionValue) { | ||
| query.andWhere(condition, conditionValue); | ||
| } | ||
|
|
||
| query.select([ | ||
| 'classroom.name AS classroom_name', | ||
| 'classroom.countryCode as classroom_country', | ||
| 'student.firstname AS student_firstname', | ||
| 'student.lastname AS student_lastname', | ||
| 'student.id AS student_id', | ||
| 'student.createdAt as student_creation_date', | ||
| 'village.name AS village_name', | ||
| ]); | ||
|
|
||
| return query.getRawMany(); | ||
| }; | ||
|
|
||
| export const getConnectedFamiliesCount = async (filterParams: StatsFilterParams) => { | ||
| const { villageId, classroomId, phase } = filterParams; | ||
| const query = studentRepository | ||
| .createQueryBuilder('student') | ||
| .innerJoin('classroom', 'classroom', 'classroom.id = student.classroomId') | ||
| .andWhere('student.numLinkedAccount >= 1'); | ||
|
|
||
| if (classroomId) { | ||
| query.andWhere('classroom.id = :classroomId', { classroomId }); | ||
| } | ||
|
|
||
| if (villageId) { | ||
| query.andWhere('classroom.villageId = :villageId', { villageId }); | ||
|
|
||
| if (phaseWasSelected(phase)) { | ||
| const phaseValue = phase as number; | ||
| const { debut, end } = await getPhasePeriod(villageId, phaseValue); | ||
| query.andWhere('student.createdAt >= :debut', { debut }); | ||
| if (phaseValue != (await villageRepository.findOne({ where: { id: villageId } }))?.activePhase) { | ||
| query.andWhere('student.createdAt <= :end', { end }); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return await query.getCount(); | ||
| }; | ||
|
|
||
| export const getFloatingAccounts = async (filterParams: StatsFilterParams) => { | ||
| const { villageId } = filterParams; | ||
| const query = userRepository.createQueryBuilder('user').where('user.hasStudentLinked = 0').andWhere('user.type = 4'); | ||
|
|
||
| if (villageId) query.andWhere('user.villageId = :villageId', { villageId }); | ||
|
|
||
| query.select(['user.id', 'user.firstname', 'user.lastname', 'user.language', 'user.email', 'user.createdAt']); | ||
| const floatingAccounts = await query.getMany(); | ||
| return floatingAccounts; | ||
| }; | ||
|
|
||
| export const getFamilyAccountsCount = async (filterParams: { villageId: number | undefined; phase: VillagePhase | undefined }) => { | ||
| const { villageId, phase } = filterParams; | ||
| const village = await villageRepository.findOne({ where: { id: villageId } }); | ||
| const query = userRepository | ||
| .createQueryBuilder('user') | ||
| .innerJoin('user.village', 'village') | ||
| .innerJoin('classroom', 'classroom', 'classroom.villageId = village.id') | ||
| .innerJoin('student', 'student', 'student.classroomId = classroom.id') | ||
| .where('user.type = 3'); | ||
|
|
||
| if (villageId) { | ||
| query.andWhere('classroom.villageId = :villageId', { villageId }); | ||
| if (phaseWasSelected(phase)) { | ||
| const phaseValue = phase as number; | ||
| const { debut, end } = await getPhasePeriod(villageId, phaseValue); | ||
| query.andWhere('user.createdAt >= :debut', { debut }); | ||
| if (phaseValue != village?.activePhase) query.andWhere('student.createdAt <= :end', { end }); | ||
| } | ||
| } | ||
|
|
||
| query.groupBy('user.id'); | ||
| const familyAccountsCount = await query.getCount(); | ||
| return familyAccountsCount; | ||
| }; | ||
|
|
||
| export const generateEmptyFilterParams = (): StatsFilterParams => { | ||
| const filterParams: { [K in keyof StatsFilterParams]: StatsFilterParams[K] } = { | ||
| villageId: undefined, | ||
| classroomId: undefined, | ||
| phase: undefined, | ||
| }; | ||
|
|
||
| return filterParams; | ||
| }; | ||
| export type WhereClause = { | ||
| clause: string; | ||
| value: object; | ||
| }; | ||
| export const getChildrenCodesCount = async (filterParams: StatsFilterParams, whereClause?: WhereClause) => { | ||
| const { villageId, phase } = filterParams; | ||
| const village = await villageRepository.findOne({ where: { id: villageId } }); | ||
| const query = studentRepository.createQueryBuilder('student').innerJoin('student.classroom', 'classroom').innerJoin('classroom.village', 'village'); | ||
| if (whereClause) query.where(whereClause.clause, whereClause.value); | ||
|
|
||
| if (phaseWasSelected(phase) && villageId) { | ||
| const phaseValue = phase as number; | ||
| const { debut, end } = await getPhasePeriod(villageId, phaseValue); | ||
| query.andWhere('student.createdAt >= :debut', { debut }); | ||
| if (phaseValue != village?.activePhase) query.andWhere('student.createdAt <= :end', { end }); | ||
| } | ||
|
|
||
| return await query.getCount(); | ||
| }; | ||
|
|
||
| export const getPhasePeriod = async (villageId: number, phase: number): Promise<{ debut: Date | undefined; end: Date | undefined }> => { | ||
| // Getting the debut and end dates for the given phase | ||
| const query = phaseHistoryRepository | ||
| .createQueryBuilder('phaseHistory') | ||
| .withDeleted() | ||
| .where('phaseHistory.villageId = :villageId', { villageId }) | ||
| .andWhere('phaseHistory.phase = :phase', { phase }); | ||
| query.select(['phaseHistory.startingOn', 'phaseHistory.endingOn']); | ||
| const result = await query.getOne(); | ||
| const debut = result?.startingOn; | ||
| const end = result?.endingOn; | ||
| return { | ||
| debut, | ||
| end, | ||
| }; | ||
| }; | ||
|
|
||
| export const phaseWasSelected = (phase: number | undefined): boolean => { | ||
| return phase !== undefined && Object.values(VillagePhase).includes(+phase); | ||
| }; |
Oops, something went wrong.