Merge pull request #672 from hhaccessibility/add-user-answer-deleted-field

Add user answer deleted field

Author: joshi1983

app/app/AnswerRepository.php

@@ -212,6 +212,7 @@ public static function commitAnswersForLocation(string $location_id)
         $location_key = 'answers_'.$location_id.'_';
         $now = new DateTime('now', new DateTimeZone('UTC'));
         $user_answers = [];
+        $question_ids = [];
         $review_comments = [];
         foreach (Session::all() as $key => $obj) {
             if (strpos($key, $location_key) === 0) {
@@ -236,6 +237,7 @@ public static function commitAnswersForLocation(string $location_id)
                 } else {
                     // Answer to a question
                     $question_id = intval(substr($key, strlen($location_key)));
+                    $question_ids []= $question_id;
                     $answer_value = $obj;
                     $user_answers []= [
                         'id' => Uuid::generate(4)->string,
@@ -248,6 +250,11 @@ public static function commitAnswersForLocation(string $location_id)
             }
         }
         if (!empty($user_answers) || !empty($review_comments)) {
+            UserAnswer::where('location_id', '=', $location_id)
+                ->where('answered_by_user_id', '=', $user_id)
+                ->whereNull('deleted_at')
+                ->whereIn('question_id', $question_ids)
+                ->update(['deleted_at' => date('Y-m-d H:i:s')]);
             UserAnswer::insert($user_answers);
             ReviewComment::insert($review_comments);
             // invalidate the cache.

app/app/Question.php

@@ -37,15 +37,12 @@ public function getAccessibilityRating($location_id, $ratingSystem)
         if ($location->ratings_cache && isset($location->ratings_cache[''.$this->id])) {
             return $location->ratings_cache[$this->id];
         }
-        
+
         $answers = $this->answers()
-            ->join('user_answer as a2', 'a2.answered_by_user_id', '=', 'user_answer.answered_by_user_id')
-            ->where('a2.location_id', '=', $location_id)
-            ->whereRaw('a2.question_id = user_answer.question_id')
+            ->whereNull('deleted_at')
+            ->where('location_id', '=', $location_id)
             ->where('user_answer.location_id', '=', $location_id)
-            ->groupBy(['user_answer.answered_by_user_id', 'a2.when_submitted'])
-            ->havingRaw('max(user_answer.when_submitted) = a2.when_submitted')
-            ->get([DB::raw('avg(a2.answer_value) as answer_value')]);
+            ->get(['answer_value']);
         $sum = 0;
         $totalCount = 0;
         foreach ($answers as $answer) {

app/app/UserAnswer.php

@@ -4,16 +4,19 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class UserAnswer extends Model
 {
+    use SoftDeletes;
     protected $fillable = [
         'answered_by_user_id', 'question_id', 'location_id', 'answer_value',
     ];
     public $timestamps = false;
-    
+    protected $softDelete = true;
+    protected $dates = ['deleted_at'];
     protected $table = 'user_answer';
-    
+
     public function __construct()
     {
         $this->attributes = array('id' => Uuid::generate(4)->string);

app/composer.json

@@ -51,6 +51,7 @@
         ],
         "all": [
             "@composer cs",
+            "@composer cs-migrations",
             "@composer cs-tests",
             "@composer tests"
         ],
@@ -60,6 +61,7 @@
         ],
         "cs": "\"vendor/bin/phpcs\" --standard=phpcs.xml",
         "cs-fix": "\"vendor/bin/phpcbf\" --standard=phpcs.xml",
+        "cs-migrations": "\"vendor/bin/phpcs\" --standard=phpcs.migrations.xml",
         "cs-tests": "\"vendor/bin/phpcs\" --standard=phpcs.tests.xml",
         "cs-tests-fix": "\"vendor/bin/phpcbf\" --standard=phpcs.tests.xml",
         "tests": "\"vendor/bin/phpunit\""