Merge pull request #597 from ProgressPlanner/filip/v19/improve-was-completed-check

Improve "was task completed" check

Author: aristath

classes/class-suggested-tasks.php

@@ -439,6 +439,14 @@ public function rest_prepare_recommendation( $response, $post ) {
 
 			// This has to be the last item to be added because actions use data from previous items.
 			$response->data['prpl_task_actions'] = $provider->get_task_actions( $response->data );
+
+			/*
+			Check if task was completed before - for example, comments were disabled and then re-enabled, and remove points if so.
+			 * Those are tasks which are completed by toggling an option, so non repetitive & not user tasks.
+			*/
+			if ( ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['meta']['prpl_task_id'] ) ) {
+				$response->data['meta']['prpl_points'] = 0;
+			}
 		}
 
 		$category_term = \wp_get_object_terms( $post->ID, 'prpl_recommendations_category' );

classes/suggested-tasks/class-tasks-interface.php

@@ -120,4 +120,13 @@ public function get_popover_id();
 	 * @return array
 	 */
 	public function add_task_actions( $data = [], $actions = [] );
+
+	/**
+	 * Check if the task has activity.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function task_has_activity( $task_id = '' );
 }

classes/suggested-tasks/providers/class-select-locale.php

@@ -173,14 +173,14 @@ function ( $locale ) {
 	 * @return bool
 	 */
 	public function is_task_completed( $task_id = '' ) {
-		$locale_activity = \progress_planner()->get_activities__query()->query_activities(
+		$activity = \progress_planner()->get_activities__query()->query_activities(
 			[
 				'category' => 'suggested_task',
 				'data_id'  => static::PROVIDER_ID,
 			]
 		);
 
-		return ! empty( $locale_activity );
+		return ! empty( $activity );
 	}
 
 	/**

classes/suggested-tasks/providers/class-select-timezone.php

@@ -85,14 +85,14 @@ protected function get_title() {
 	 * @return bool
 	 */
 	public function should_add_task() {
-		$timezone_activity = \progress_planner()->get_activities__query()->query_activities(
+		$activity = \progress_planner()->get_activities__query()->query_activities(
 			[
 				'category' => 'suggested_task',
 				'data_id'  => static::PROVIDER_ID,
 			]
 		);
 
-		return ! $timezone_activity;
+		return ! $activity;
 	}
 
 	/**

classes/suggested-tasks/providers/class-tasks.php

@@ -704,4 +704,26 @@ function ( $a, $b ) {
 	public function add_task_actions( $data = [], $actions = [] ) {
 		return $actions;
 	}
+
+	/**
+	 * Check if the task has activity.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function task_has_activity( $task_id = '' ) {
+		if ( empty( $task_id ) ) {
+			$task_id = $this->get_task_id();
+		}
+
+		$activity = \progress_planner()->get_activities__query()->query_activities(
+			[
+				'category' => 'suggested_task',
+				'data_id'  => $task_id,
+			]
+		);
+
+		return ! empty( $activity );
+	}
 }