Merge pull request #1199 from IFRCGo/fix/appeal-stats

Fix appeals statistics calculation
IFRCGo · Jun 20, 2024 · 0a68faa · 0a68faa
2 parents a3e0bc8 + d9491a2
commit 0a68faa
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 48 deletions.
diff --git a/.changeset/unlucky-panthers-check.md b/.changeset/unlucky-panthers-check.md
@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Fix appeals based statistics calculation
diff --git a/app/src/components/domain/ActiveOperationMap/index.tsx b/app/src/components/domain/ActiveOperationMap/index.tsx
@@ -181,8 +181,8 @@ function ActiveOperationMap(props: Props) {
 
             return {
                 ...baseQuery,
-                region: isDefined(regionId) ? [regionId] : undefined,
-                country: isDefined(countryId) ? [countryId] : undefined,
+                region: isDefined(regionId) ? regionId : undefined,
+                country: isDefined(countryId) ? countryId : undefined,
             };
         },
         [variant, regionId, filter, limit, countryId],

diff --git a/app/src/components/domain/AppealsTable/index.tsx b/app/src/components/domain/AppealsTable/index.tsx
@@ -120,7 +120,7 @@ function AppealsTable(props: Props) {
 
     const columns = useMemo(
         () => ([
-            createDateColumn<AppealListItem, string>(
+            createDateColumn<AppealListItem, number>(
                 'start_date',
                 strings.appealsTableStartDate,
                 (item) => item.start_date,
@@ -129,7 +129,7 @@ function AppealsTable(props: Props) {
                     columnClassName: styles.startDate,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'atype',
                 strings.appealsTableType,
                 (item) => item.atype_display,
@@ -138,15 +138,15 @@ function AppealsTable(props: Props) {
                     columnClassName: styles.appealType,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'code',
                 strings.appealsTableCode,
                 (item) => item.code,
                 {
                     columnClassName: styles.code,
                 },
             ),
-            createLinkColumn<AppealListItem, string>(
+            createLinkColumn<AppealListItem, number>(
                 'operation',
                 strings.appealsTableOperation,
                 (item) => item.name,
@@ -155,13 +155,13 @@ function AppealsTable(props: Props) {
                     urlParams: { emergencyId: item.event },
                 }),
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'dtype',
                 strings.appealsTableDisastertype,
                 (item) => item.dtype?.name,
                 { sortable: true },
             ),
-            createNumberColumn<AppealListItem, string>(
+            createNumberColumn<AppealListItem, number>(
                 'amount_requested',
                 strings.appealsTableRequestedAmount,
                 (item) => item.amount_requested,
@@ -170,7 +170,7 @@ function AppealsTable(props: Props) {
                     suffix: ' CHF',
                 },
             ),
-            createProgressColumn<AppealListItem, string>(
+            createProgressColumn<AppealListItem, number>(
                 'amount_funded',
                 strings.appealsTableFundedAmount,
                 (item) => (
@@ -182,7 +182,7 @@ function AppealsTable(props: Props) {
                 { sortable: true },
             ),
             variant !== 'country'
-                ? createLinkColumn<AppealListItem, string>(
+                ? createLinkColumn<AppealListItem, number>(
                     'country',
                     strings.appealsTableCountry,
                     (item) => item.country?.name,
@@ -225,8 +225,8 @@ function AppealsTable(props: Props) {
 
             return {
                 ...baseQuery,
-                country: isDefined(countryId) ? [countryId] : undefined,
-                region: isDefined(regionId) ? [regionId] : undefined,
+                country: isDefined(countryId) ? countryId : undefined,
+                region: isDefined(regionId) ? regionId : undefined,
             };
         },
         [

diff --git a/app/src/components/domain/RegionKeyFigures/index.tsx b/app/src/components/domain/RegionKeyFigures/index.tsx
@@ -87,8 +87,8 @@ function RegionKeyFigures(props: Props) {
                 icon={<FundingCoverageIcon />}
                 className={styles.keyFigure}
                 value={getPercentage(
-                    aggregatedAppealResponse?.amount_funded,
-                    aggregatedAppealResponse?.amount_requested,
+                    aggregatedAppealResponse?.amount_funded_dref_included,
+                    aggregatedAppealResponse?.amount_requested_dref_included,
                 )}
                 suffix="%"
                 compactValue

diff --git a/app/src/views/AllAppeals/index.tsx b/app/src/views/AllAppeals/index.tsx
@@ -143,8 +143,8 @@ export function Component() {
             ordering,
             atype: filterAppealType,
             dtype: filterDisasterType,
-            country: isDefined(filterCountry) ? [filterCountry] : undefined,
-            region: isDefined(filterRegion) ? [filterRegion] : undefined,
+            country: isDefined(filterCountry) ? filterCountry : undefined,
+            region: isDefined(filterRegion) ? filterRegion : undefined,
             start_date__gte: filter.startDateAfter,
             start_date__lte: filter.startDateBefore,
         }),
@@ -170,7 +170,7 @@ export function Component() {
 
     const columns = useMemo(
         () => ([
-            createDateColumn<AppealListItem, string>(
+            createDateColumn<AppealListItem, number>(
                 'start_date',
                 strings.allAppealsStartDate,
                 (item) => item.start_date,
@@ -179,7 +179,7 @@ export function Component() {
                     columnClassName: styles.startDate,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'atype',
                 strings.allAppealsType,
                 (item) => item.atype_display,
@@ -188,15 +188,15 @@ export function Component() {
                     columnClassName: styles.appealType,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'code',
                 strings.allAppealsCode,
                 (item) => item.code,
                 {
                     columnClassName: styles.code,
                 },
             ),
-            createLinkColumn<AppealListItem, string>(
+            createLinkColumn<AppealListItem, number>(
                 'operation',
                 strings.allAppealsOperation,
                 (item) => item.name,
@@ -206,12 +206,12 @@ export function Component() {
                 }),
                 { sortable: true },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'dtype',
                 strings.allAppealsDisasterType,
                 (item) => item.dtype?.name,
             ),
-            createNumberColumn<AppealListItem, string>(
+            createNumberColumn<AppealListItem, number>(
                 'amount_requested',
                 strings.allAppealsRequestedAmount,
                 (item) => item.amount_requested,
@@ -220,7 +220,7 @@ export function Component() {
                     suffix: ' CHF',
                 },
             ),
-            createProgressColumn<AppealListItem, string>(
+            createProgressColumn<AppealListItem, number>(
                 'amount_funded',
                 strings.allAppealsFundedAmount,
                 // FIXME: use progress function
@@ -235,7 +235,7 @@ export function Component() {
                     columnClassName: styles.funding,
                 },
             ),
-            createLinkColumn<AppealListItem, string>(
+            createLinkColumn<AppealListItem, number>(
                 'country',
                 strings.allAppealsCountry,
                 (item) => item.country?.name,

diff --git a/app/src/views/CountryOngoingActivitiesEmergencies/CountryKeyFigures/index.tsx b/app/src/views/CountryOngoingActivitiesEmergencies/CountryKeyFigures/index.tsx
@@ -22,9 +22,10 @@ interface Props {
         active_drefs: number | null;
         active_appeals: number | null;
         target_population: number | null;
+        amount_requested: number | null;
         amount_requested_dref_included: number | null;
         amount_funded: number | null;
-        amount_requested: number | null;
+        amount_funded_dref_included: number | null;
     }
 }
 
@@ -81,8 +82,8 @@ function CountryKeyFigures(props: Props) {
                 icon={<FundingCoverageIcon />}
                 className={styles.keyFigure}
                 value={getPercentage(
-                    data.amount_funded,
-                    data.amount_requested,
+                    data.amount_funded_dref_included,
+                    data.amount_requested_dref_included,
                 )}
                 suffix="%"
                 compactValue

diff --git a/app/src/views/CountryOngoingActivitiesEmergencies/index.tsx b/app/src/views/CountryOngoingActivitiesEmergencies/index.tsx
@@ -191,7 +191,7 @@ export function Component(props: BaseProps) {
             return {
                 ...baseQuery,
                 region: undefined,
-                country: countryId ? [Number(countryId)] : undefined,
+                country: countryId ? Number(countryId) : undefined,
             };
         },
         [filter, limit, countryId],
@@ -232,7 +232,7 @@ export function Component(props: BaseProps) {
 
     const columns = useMemo(
         () => ([
-            createDateColumn<AppealListItem, string>(
+            createDateColumn<AppealListItem, number>(
                 'start_date',
                 strings.appealsTableStartDate,
                 (item) => item.start_date,
@@ -241,7 +241,7 @@ export function Component(props: BaseProps) {
                     columnClassName: styles.startDate,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'atype',
                 strings.appealsTableType,
                 (item) => item.atype_display,
@@ -250,15 +250,15 @@ export function Component(props: BaseProps) {
                     columnClassName: styles.appealType,
                 },
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'code',
                 strings.appealsTableCode,
                 (item) => item.code,
                 {
                     columnClassName: styles.code,
                 },
             ),
-            createLinkColumn<AppealListItem, string>(
+            createLinkColumn<AppealListItem, number>(
                 'operation',
                 strings.appealsTableOperation,
                 (item) => item.name,
@@ -267,13 +267,13 @@ export function Component(props: BaseProps) {
                     urlParams: { emergencyId: item.event },
                 }),
             ),
-            createStringColumn<AppealListItem, string>(
+            createStringColumn<AppealListItem, number>(
                 'dtype',
                 strings.appealsTableDisastertype,
                 (item) => item.dtype?.name,
                 { sortable: true },
             ),
-            createNumberColumn<AppealListItem, string>(
+            createNumberColumn<AppealListItem, number>(
                 'amount_requested',
                 strings.appealsTableRequestedAmount,
                 (item) => item.amount_requested,
@@ -282,7 +282,7 @@ export function Component(props: BaseProps) {
                     suffix: ' CHF',
                 },
             ),
-            createProgressColumn<AppealListItem, string>(
+            createProgressColumn<AppealListItem, number>(
                 'amount_funded',
                 strings.appealsTableFundedAmount,
                 // FIXME: use progress function

diff --git a/app/src/views/CountryProfilePreviousEvents/CountryHistoricalKeyFigures/index.tsx b/app/src/views/CountryProfilePreviousEvents/CountryHistoricalKeyFigures/index.tsx
@@ -70,16 +70,16 @@ function CountryHistoricalKeyFigures(props: Props) {
             <KeyFigure
                 icon={<FundingIcon />}
                 className={styles.keyFigure}
-                value={data.total_amount_requested}
+                value={data.amount_funded_dref_included}
                 compactValue
                 label={strings.keyFiguresFundingRequirements}
             />
             <KeyFigure
                 icon={<FundingCoverageIcon />}
                 className={styles.keyFigure}
                 value={getPercentage(
-                    data.total_amount_funded,
-                    data.total_amount_requested,
+                    data.amount_funded_dref_included,
+                    data.amount_requested_dref_included,
                 )}
                 suffix="%"
                 compactValue

diff --git a/app/src/views/CountryProfilePreviousEvents/EmergenciesOverMonth/index.tsx b/app/src/views/CountryProfilePreviousEvents/EmergenciesOverMonth/index.tsx
@@ -40,8 +40,8 @@ function EmergenciesOverMonth(props: Props) {
         url: '/api/v2/country/{id}/disaster-monthly-count/',
         pathVariables: { id: countryId },
         query: {
-            start_date: startDate,
-            end_date: endDate,
+            start_date_from: startDate,
+            start_date_to: endDate,
         },
     });
 

diff --git a/app/src/views/CountryProfilePreviousEvents/PastEventsChart/index.tsx b/app/src/views/CountryProfilePreviousEvents/PastEventsChart/index.tsx
@@ -129,8 +129,8 @@ function PastEventsChart(props: Props) {
         url: '/api/v2/country/{id}/historical-disaster/',
         pathVariables: { id: countryId },
         query: isDefined(selectedTimePeriod) ? {
-            start_date: encodeDate(selectedTimePeriod.startDate),
-            end_date: encodeDate(selectedTimePeriod.endDate),
+            start_date_from: encodeDate(selectedTimePeriod.startDate),
+            start_date_to: encodeDate(selectedTimePeriod.endDate),
         } : undefined,
     });
 

diff --git a/app/src/views/CountryProfilePreviousEvents/index.tsx b/app/src/views/CountryProfilePreviousEvents/index.tsx
@@ -121,8 +121,8 @@ export function Component() {
         url: '/api/v2/country/{id}/disaster-count/',
         pathVariables: { id: countryId },
         query: isDefined(selectedTimePeriod) ? ({
-            start_date: encodeDate(selectedTimePeriod.startDate),
-            end_date: encodeDate(selectedTimePeriod.endDate),
+            start_date_from: encodeDate(selectedTimePeriod.startDate),
+            start_date_to: encodeDate(selectedTimePeriod.endDate),
         }) : undefined,
     });
 
@@ -135,8 +135,8 @@ export function Component() {
         url: '/api/v2/country/{id}/figure/',
         pathVariables: { id: Number(countryId) },
         query: isDefined(selectedTimePeriod) ? ({
-            start_date: encodeDate(selectedTimePeriod.startDate),
-            end_date: encodeDate(selectedTimePeriod.endDate),
+            start_date_from: encodeDate(selectedTimePeriod.startDate),
+            start_date_to: encodeDate(selectedTimePeriod.endDate),
         }) : undefined,
     });
 

diff --git a/app/src/views/Home/index.tsx b/app/src/views/Home/index.tsx
@@ -118,8 +118,8 @@ export function Component() {
                 icon={<FundingCoverageIcon />}
                 className={styles.keyFigure}
                 value={getPercentage(
-                    aggregatedAppealResponse?.amount_funded,
-                    aggregatedAppealResponse?.amount_requested,
+                    aggregatedAppealResponse?.amount_funded_dref_included,
+                    aggregatedAppealResponse?.amount_requested_dref_included,
                 )}
                 suffix="%"
                 compactValue