Merge pull request #685 from hhaccessibility/drop-user-location

Drop user location

Author: joshi1983

app/app/AnswerRepository.php

@@ -262,8 +262,6 @@ public static function commitAnswersForLocation(string $location_id)
             $location->universal_rating = null;
             $location->ratings_cache = null;
             $location->save();
-            // invalidate the personalized rating cache for this location.
-            DB::table('user_location')->where('location_id', '=', $location_id)->delete();
         }
         AnswerRepository::destroyUncommittedChanges();
     }

app/app/Http/Controllers/InternalFeaturesController.php

@@ -40,6 +40,8 @@ public function deleteUser(Request $request)
             DB::table('review_comment')->where('answered_by_user_id', '=', $user->id)->delete();
             DB::table('location')->where('creator_user_id', '=', $user->id)->update(['creator_user_id' => null]);
             DB::table('location')->where('owner_user_id', '=', $user->id)->update(['owner_user_id' => null]);
+            DB::table('suggestion')->where('user_id', '=', $user->id)->delete();
+            DB::table('image')->where('uploader_user_id', '=', $user_id)->delete();
             DB::table('user')->where('id', '=', $user->id)->delete();
         });
         return Redirect::to('users');

app/app/Http/Controllers/ProfileController.php

@@ -130,13 +130,6 @@ public function save(Request $request)
                 $questions_updated = true;
             }
         }
-        if ($questions_updated) {
-            /*
-            If the accessibility needs changed,
-            the personalized ratings need to be recalculated.
-            */
-            $user->personalizedRatings()->detach();
-        }
 
         $user->save();
 

app/app/Location.php

@@ -52,11 +52,6 @@ public function tags()
         return $this->belongsToMany('App\LocationTag');
     }
 
-    public function personalizedRatings()
-    {
-        return $this->hasMany('App\UserLocation');
-    }
-
     public function comments()
     {
         return $this->hasMany(ReviewComment::class);

app/app/User.php

@@ -81,18 +81,7 @@ public function requiredQuestions()
     {
         return $this->belongsToMany(Question::class, 'user_question');
     }
-    
-    /**
-    personalizedRatings reteurns an Eloquent query object that
-    can be used to get the personalized ratings for various locations.
 
-    This is used as a cache for speeding up display of many locations while signed in.
-    */
-    public function personalizedRatings()
-    {
-        return $this->belongsToMany(Location::class, 'user_location');
-    }
-    
     public static function generateSaltedHash($password)
     {
         return Hash::make($password);

app/database/migrations/2018_08_17_100000_drop_user_location_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class DropUserLocationTable extends Migration
+{
+    public function up()
+    {
+        Schema::dropIfExists('user_location');
+    }
+
+    public function down()
+    {
+        Schema::create('user_location', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('user_id', 36);
+            $table->foreign('user_id')->references('id')->on('user');
+            $table->string('location_id', 36);
+            $table->foreign('location_id')->references('id')->on('location');
+            $table->double('personalized_rating', 11, 8);
+            $table->datetime('when_submitted');
+            $table->unique(array('location_id', 'user_id'));
+        });
+    }
+}