fix(user): 修复 At 我的获取最新预览消息用户名错为自身

zhiyicx/thinksns-plus-android#2304
slimkit · Sep 6, 2018 · 33cefe3 · 33cefe3
1 parent 0d9606b
commit 33cefe3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/app/AtMessage/Message.php b/app/AtMessage/Message.php
@@ -69,7 +69,7 @@ public function __construct(ResourceManagerInterface $manager, Model $model, Pus
     public function send(UserModel $sender, UserModel $user, $resource): void
     {
         $resource = $this->manager->resource($resource, $sender);
-        $atMessage = $this->message($resource, $user);
+        $atMessage = $this->message($resource, $user, $sender);
         $this->save(function () use ($resource, $atMessage, $user) {
             $atMessage->save();
             $this->updateAtMessageCount($user);
@@ -82,14 +82,16 @@ public function send(UserModel $sender, UserModel $user, $resource): void
      * Create a at message model.
      * @param \Zhiyi\Plus\AtMessage\ResourceInterface $resource
      * @param \Zhiyi\Plus\Models\User $user
+     * @param \Zhiyi\Plus\Models\User $sender
      * @return \Zhiyi\Plus\Models\AtMessage
      */
-    public function message(ResourceInterface $resource, UserModel $user): Model
+    public function message(ResourceInterface $resource, UserModel $user, UserModel $sender): Model
     {
         $message = $this->model->newInstance();
         $message->resourceable_type = $resource->type();
         $message->resourceable_id = $resource->id();
         $message->user_id = $user->id;
+        $message->sender_id = $sender->id;
 
         return $message;
     }

diff --git a/app/Http/Controllers/APIs/V2/UserUnreadCountController.php b/app/Http/Controllers/APIs/V2/UserUnreadCountController.php
@@ -106,10 +106,10 @@ public function index(Request $request, CommentModel $commentModel, LikeModel $l
 
         // at 最近三个用户
         $atMeUsers = (new AtMessageModel)->query()
-            ->with('user')
+            ->with('sender')
             ->where('user_id', $user->id)
-            ->limit(3)
             ->orderBy('id', 'desc')
+            ->limit(3)
             ->get();
         $atLatestTimestamp = ($atMeUsersLatest = $atMeUsers->first()) ? $this->dateTimeToIso8601ZuluString($atMeUsersLatest->{AtMessageModel::CREATED_AT}) : null;
 
@@ -122,8 +122,8 @@ public function index(Request $request, CommentModel $commentModel, LikeModel $l
             'system' => $lastSystem,
             'atme' => $atMeUsers->isEmpty() ? null : [
                 'users' => $atMeUsers->map(function ($item) {
-                    return $item->user->name ?? null;
-                })->filter()->all(),
+                    return $item->sender->name ?? null;
+                })->filter()->unique()->all(),
                 'latest_at' => $atLatestTimestamp,
             ],
         ], function ($item) {

diff --git a/app/Models/AtMessage.php b/app/Models/AtMessage.php
@@ -37,4 +37,13 @@ public function user(): HasOne
     {
         return $this->hasOne(User::class, 'id', 'user_id');
     }
+
+    /**
+     * The model sender relation.
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function sender(): HasOne
+    {
+        return $this->hasOne(User::class, 'id', 'sender_id');
+    }
 }
diff --git a/database/migrations/2018_08_13_025044_create_at_messages_table.php b/database/migrations/2018_08_13_025044_create_at_messages_table.php
@@ -34,6 +34,7 @@ public function up()
             $table->string('resourceable_type')->comment('资源类型');
             $table->integer('resourceable_id')->unsigned()->comment('资源 ID');
             $table->integer('user_id')->unsigned()->comment('接受 At Message 消息用户');
+            $table->integer('sender_id')->unsigned()->comment('发送 At 消息的用户ID');
             $table->timestamps();
 
             $table->index('user_id');