Refactor: Update goal progress with campaign entity (#7628)

src/Campaigns/Controllers/CampaignRequestController.php

@@ -3,6 +3,7 @@
 namespace Give\Campaigns\Controllers;
 
 use Exception;
+use Give\Campaigns\CampaignDonationQuery;
 use Give\Campaigns\Models\Campaign;
 use Give\Campaigns\Repositories\CampaignRepository;
 use Give\Campaigns\ValueObjects\CampaignGoalType;
@@ -31,7 +32,11 @@ public function getCampaign(WP_REST_Request $request)
             return new WP_Error('campaign_not_found', __('Campaign not found', 'give'), ['status' => 404]);
         }
 
-        return new WP_REST_Response($campaign->toArray());
+        return new WP_REST_Response(
+            array_merge($campaign->toArray(), [
+                'goalProgress' => $campaign->goalProgress(),
+            ])
+        );
     }
 
     /**

src/Campaigns/Models/Campaign.php

@@ -5,6 +5,7 @@
 use DateTime;
 use Exception;
 use Give\Campaigns\Actions\ConvertQueryDataToCampaign;
+use Give\Campaigns\CampaignDonationQuery;
 use Give\Campaigns\Factories\CampaignFactory;
 use Give\Campaigns\Repositories\CampaignPageRepository;
 use Give\Campaigns\Repositories\CampaignRepository;
@@ -193,6 +194,12 @@ public function merge(Campaign ...$campaignsToMerge): bool
         return give(CampaignRepository::class)->mergeCampaigns($this, ...$campaignsToMerge);
     }
 
+    public function goalProgress()
+    {
+        $query = new CampaignDonationQuery($this);
+        return $query->sumIntendedAmount();
+    }
+
     /**
      * @unreleased
      *

src/Campaigns/Routes/RegisterCampaignRoutes.php

@@ -219,6 +219,11 @@ public function getSchema(): array
                     'description' => esc_html__('Campaign goal', 'give'),
                     'errorMessage' => esc_html__('Must be a number', 'give'),
                 ],
+                'goalProgress' => [
+                    'type' => 'number',
+                    'readonly' => true,
+                    'description' => esc_html__('Campaign goal progress', 'give'),
+                ],
                 'goalType' => [
                     'enum' => [
                         'amount',

src/Campaigns/resources/admin/components/CampaignDetailsPage/Components/CampaignStats.tsx

@@ -8,6 +8,7 @@ import HeaderText from './HeaderText';
 import HeaderSubText from './HeaderSubText';
 import DefaultFormWidget from "./DefaultForm";
 import {GiveCampaignDetails} from "@givewp/campaigns/admin/components/CampaignDetailsPage/types";
+import useCampaignEntityRecord from "@givewp/campaigns/admin/components/CampaignDetailsPage/useCampaignEntityRecord";
 
 const campaignId = new URLSearchParams(window.location.search).get('id');
 
@@ -178,6 +179,9 @@ const RevenueWidget = () => {
 }
 
 const GoalProgressWidget = () => {
+
+    const {campaign} = useCampaignEntityRecord();
+
     return (
         <div style={{
             flex: 1,
@@ -187,7 +191,7 @@ const GoalProgressWidget = () => {
         }}>
             <HeaderText>{__('Goal Progress')}</HeaderText>
             <HeaderSubText>{__('Show your campaign performance')}</HeaderSubText>
-            <GoalProgressChart value={450} goal={2000} />
+            <GoalProgressChart value={campaign.goalProgress} goal={campaign.goal} />
         </div>
     )
 }

src/Campaigns/resources/admin/components/CampaignDetailsPage/index.tsx

@@ -18,6 +18,7 @@ import NotificationPlaceholder from '../Notifications';
 import cx from 'classnames';
 
 import styles from './CampaignDetailsPage.module.scss';
+import useCampaignEntityRecord from "@givewp/campaigns/admin/components/CampaignDetailsPage/useCampaignEntityRecord";
 
 declare const window: {
     GiveCampaignDetails: GiveCampaignDetails;
@@ -75,16 +76,11 @@ export default function CampaignsDetailsPage({campaignId}) {
     }, []);
 
     const {
-        record: campaign,
+        campaign,
         hasResolved,
         save,
         edit,
-    }: {
-        record: Campaign;
-        hasResolved: boolean;
-        save: () => any;
-        edit: (data: Campaign) => void;
-    } = useEntityRecord('givewp', 'campaign', campaignId);
+    } = useCampaignEntityRecord();
 
     const methods = useForm<Campaign>({
         mode: 'onChange',

src/Campaigns/resources/admin/components/CampaignDetailsPage/useCampaignEntityRecord.tsx

@@ -0,0 +1,24 @@
+import {useEntityRecord} from "@wordpress/core-data";
+import {Campaign} from "@givewp/campaigns/admin/components/types";
+
+const urlParams = new URLSearchParams(window.location.search);
+const campaignId = urlParams.get('id');
+
+/**
+ * @unreleased
+ */
+export default () => {
+    const {
+        record: campaign,
+        hasResolved,
+        save,
+        edit,
+    }: {
+        record: Campaign;
+        hasResolved: boolean;
+        save: () => any;
+        edit: (data: Campaign) => void;
+    } = useEntityRecord('givewp', 'campaign', campaignId);
+
+    return {campaign, hasResolved, save, edit};
+}

src/Campaigns/resources/admin/components/types.ts

@@ -10,6 +10,7 @@ export type Campaign = {
     secondaryColor: string;
     goalType: string;
     goal: number;
+    goalProgress: number;
     status: string;
     startDateTime: {
         date: string;