Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/search/classes/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
//@index('./*', f => `export * from '${f.path}'`)
export * from "./Search.class";
export * from "./UsagerCountByStatus.class";
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// @index('./*', f => `export * from '${f.path}'`)
export * from "./UsagersFilterCriteria";
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import {
UsagersFilterCriteria,
UsagersFilterCriteriaSortKey,
} from "../usager-filter/UsagersFilterCriteria";
} from "../../classes/UsagersFilterCriteria";
import {
extractDeadlines,
UsagersFilterCriteriaDernierPassage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ import {

import { UsagerFormModel } from "../../../usager-shared/interfaces";

import {
UsagersCountByStatus,
usagersFilter,
UsagersFilterCriteria,
UsagersFilterCriteriaSortKey,
} from "../usager-filter";
import { Store } from "@ngrx/store";
import { ManageUsagersService } from "../../services/manage-usagers.service";
import {
Expand All @@ -53,14 +47,20 @@ import {
SortValues,
UsagersFilterCriteriaStatut,
UserStructure,
UsagersCountByStatus,
} from "@domifa/common";
import { MatomoTracker } from "ngx-matomo-client";
import { AuthService, CustomToastService } from "../../../shared/services";
import { UsagerLight } from "../../../../../_common/model";
import {
UsagersFilterCriteria,
UsagersFilterCriteriaSortKey,
} from "../../classes";
import {
calculateUsagersCountByStatus,
usagersFilter,
usagersSorter,
} from "../usager-filter/services";
} from "../../services/usager-filter";

const FIVE_MINUTES = 5 * 60 * 1000;
const STORAGE_KEY = "SEARCH";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import { MATOMO_INJECTORS, _usagerReducer } from "../../../../shared";
import { StoreModule } from "@ngrx/store";
import { APP_BASE_HREF } from "@angular/common";
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
import { UsagersFilterCriteria } from "../usager-filter";

import { Subject } from "rxjs";
import { UsagersFilterCriteria } from "../../classes";

describe("ManageUsagersTableComponent", () => {
let component: ManageUsagersTableComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
import { fadeInOut } from "../../../../shared";
import { UsagerFormModel } from "../../../usager-shared/interfaces";

import { UsagersFilterCriteria } from "../usager-filter";
import { Router } from "@angular/router";
import { AuthService } from "../../../shared/services";
import { getUrlUsagerProfil } from "../../../usager-shared/utils";
Expand All @@ -34,6 +33,7 @@ import {
faArrowUp,
faSort,
} from "@fortawesome/free-solid-svg-icons";
import { UsagersFilterCriteria } from "../../classes";

@Component({
animations: [fadeInOut],
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import {
buildWords,
CriteriaSearchField,
ETAPE_ENTRETIEN,
buildWords,
search,
UsagersFilterCriteriaEntretien,
ETAPE_ENTRETIEN,
} from "@domifa/common";
import { UsagerLight } from "../../../../../_common/model";
import { isValid, parse } from "date-fns";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../../classes/UsagersFilterCriteria";
import {
getAttributes,
usagerEcheanceChecker,
usagerStatutChecker,
usagerInteractionTypeChecker,
usagerEcheanceChecker,
usagerPassageChecker,
usagerStatutChecker,
} from "./services";
import { UsagersFilterCriteria } from "./UsagersFilterCriteria";
import { isValid, parse } from "date-fns";
} from "../../../services/usager-filter";

export const usagersFilter = {
filter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Pipe, PipeTransform } from "@angular/core";
import { UsagersFilterCriteriaSortKey } from "../components/usager-filter";
import { UsagersFilterCriteriaSortKey } from "../classes";

@Pipe({
name: "sortLabel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
usagerActions,
UsagerState,
} from "../../../shared";
import { UsagersFilterCriteria } from "../components/usager-filter";
import { UsagerLight } from "../../../../_common/model";
import { UsagersFilterCriteria } from "../classes";

@Injectable({
providedIn: "root",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UsagersCountByStatus } from "..";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagersCountByStatus } from "@domifa/common";
import { UsagerLight } from "../../../../../_common/model";

export function calculateUsagersCountByStatus(
usagers: UsagerLight[],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @index(['./*.service.ts' ], f => `export * from '${f.path}'`)
export * from "./usagerEcheanceChecker.service";
export * from "./usagerInteractionTypeChecker.service";
export * from "./usagerPassageChecker.service";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addMonths, addYears, subDays, subMonths, subYears } from "date-fns";
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagerLight } from "../../../../../../_common/model";
import { usagerEcheanceChecker } from "./usagerEcheanceChecker.service";

describe("usagerEcheanceChecker EXCEEDED", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../UsagersFilterCriteria";
import { USAGER_DEADLINES } from "../../USAGER_DEADLINES.const";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../../classes/UsagersFilterCriteria";
import { USAGER_DEADLINES } from "../../../constants/USAGER_DEADLINES.const";

export const usagerEcheanceChecker = {
check,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagerLight } from "../../../../../../_common/model";
import { usagerInteractionTypeChecker } from "./usagerInteractionTypeChecker.service";

const usager1 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../UsagersFilterCriteria";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../../classes/UsagersFilterCriteria";

export const usagerInteractionTypeChecker = {
check,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { subDays, subMonths, subWeeks, subYears } from "date-fns";
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagerLight } from "../../../../../../_common/model";
import { usagerPassageChecker } from "./usagerPassageChecker.service";

describe("usagerPassageChecker ", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { UsagerLight } from "../../../../../../../_common/model";
import { USAGER_DEADLINES } from "../../USAGER_DEADLINES.const";
import { UsagersFilterCriteria } from "../../UsagersFilterCriteria";
import { UsagerLight } from "../../../../../../_common/model";
import { USAGER_DEADLINES } from "../../../constants/USAGER_DEADLINES.const";
import { UsagersFilterCriteria } from "../../../classes/UsagersFilterCriteria";

export const usagerPassageChecker = {
check,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UsagersFilterCriteriaStatut } from "@domifa/common";
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagerLight } from "../../../../../../_common/model";
import { usagerStatutChecker } from "./usagerStatutChecker.service";

const usager1 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { UsagersFilterCriteriaStatut } from "@domifa/common";
import { UsagerLight } from "../../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../UsagersFilterCriteria";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagersFilterCriteria } from "../../../classes/UsagersFilterCriteria";

export const usagerStatutChecker = {
check,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @index(['./*.service.ts', './checkers/index.ts'], f => `export * from '${f.path}'`)
export * from "./calculateUsagersCountByStatus.service";
export * from "./checkers/index";
export * from "./usagersFilter.service";
export * from "./usagersSearchStringFilter.service";
export * from "./usagersSorter.service";
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import {
CriteriaSearchField,
UsagersFilterCriteriaStatut,
} from "@domifa/common";
import { UsagersFilterCriteria } from ".";

import { UsagerLight } from "../../../../../_common/model";
import { usagersFilter } from "./usagersFilter.service";
import { UsagersFilterCriteria } from "../../classes";

const usagers: UsagerLight[] = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
import {
CriteriaSearchField,
buildWords,
search,
UsagersFilterCriteriaEntretien,
ETAPE_ENTRETIEN,
} from "@domifa/common";
import { parse, isValid } from "date-fns";
import { UsagerLight } from "../../../../../_common/model";
import { UsagersFilterCriteria } from "../../classes";
import {
usagerStatutChecker,
usagerInteractionTypeChecker,
usagerEcheanceChecker,
usagerPassageChecker,
} from "./checkers";
import { getAttributes } from "./usagersSearchStringFilter.service";

export const usagersFilter = {
filter,
};

function filter(
usagers: UsagerLight[],
{
criteria,
}: {
criteria: UsagersFilterCriteria;
}
): UsagerLight[] {
return filterByCriteria(usagers, criteria);
}

function filterByCriteria(
usagers: UsagerLight[],
criteria: UsagersFilterCriteria
): UsagerLight[] {
// Si pas de filtres ni de recherche textuelle après le traitement entretien
const activeFilters = buildActiveFilters(criteria);

if (!criteria.searchString && !activeFilters.length) {
return usagers;
}

let words = [];

if (criteria.searchString) {
if (criteria.searchStringField === CriteriaSearchField.BIRTH_DATE) {
const parsedDate = parse(
criteria.searchString.trim(),
"dd/MM/yyyy",
new Date()
);

if (isValid(parsedDate)) {
words.push(criteria.searchString);
}
} else {
words = buildWords(criteria.searchString);
}
}

return usagers.filter((usager) => {
if (
activeFilters.length &&
!activeFilters.every((filter) => filter(usager))
) {
return false;
}

if (words.length === 0) {
return true;
}

const attributes = getAttributes(usager, criteria);

if (criteria.searchStringField === "BIRTH_DATE") {
return attributes.includes(criteria.searchString);
}

return search.match(usager, {
index: 0,
getAttributes: () => attributes,
words,
withScore: false,
}).match;
});
}

function buildActiveFilters(criteria: UsagersFilterCriteria) {
// Créer un tableau de fonctions de filtrage actives
const activeFilters = [];

if (criteria.entretien) {
activeFilters.push((usager: UsagerLight) =>
filterByEntretien(usager, criteria.entretien)
);
}

if (typeof criteria.referrerId !== "undefined") {
activeFilters.push(
(usager: UsagerLight) => usager.referrerId === criteria.referrerId
);
}

if (criteria.statut) {
activeFilters.push((usager: UsagerLight) =>
usagerStatutChecker.check({ usager, statut: criteria.statut })
);
}

if (criteria.interactionType) {
activeFilters.push((usager: UsagerLight) =>
usagerInteractionTypeChecker.check({
usager,
interactionType: criteria.interactionType,
})
);
}

if (criteria.echeance) {
activeFilters.push((usager: UsagerLight) =>
usagerEcheanceChecker.check({ usager, echeance: criteria.echeance })
);
}

if (criteria.lastInteractionDate) {
activeFilters.push((usager: UsagerLight) =>
usagerPassageChecker.check({
usager,
lastInteractionDate: criteria.lastInteractionDate,
})
);
}
return activeFilters;
}

function filterByEntretien(
usager: UsagerLight,
entretien: UsagersFilterCriteriaEntretien
): boolean {
const now = new Date().toISOString().split("T")[0];

if (!usager.rdv?.dateRdv || usager.etapeDemande > ETAPE_ENTRETIEN) {
return false;
}

const dateRdv = new Date(usager.rdv.dateRdv).toISOString().split("T")[0];
return entretien === UsagersFilterCriteriaEntretien.COMING
? dateRdv > now
: dateRdv < now;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { UsagersFilterCriteria } from "../UsagersFilterCriteria";
import { UsagersFilterCriteria } from "../../classes/UsagersFilterCriteria";
import { format, isValid, parseISO } from "date-fns";
import { UsagerLight } from "../../../../../../_common/model";
import { UsagerLight } from "../../../../../_common/model";

import {
CriteriaSearchField,
Expand Down
Loading
Loading