visuddhinanda пре 1 година
родитељ
комит
fa9624b3c7

+ 7 - 2
api-v8/app/Http/Controllers/DictPreferenceController.php

@@ -9,6 +9,7 @@ use App\Models\UserDict;
 use App\Models\WordIndex;
 use App\Http\Resources\DictPreferenceResource;
 use App\Http\Api\DictApi;
+use App\Http\Api\AuthApi;
 
 class DictPreferenceController extends Controller
 {
@@ -34,6 +35,7 @@ class DictPreferenceController extends Controller
                 'user_dicts.parent',
                 'user_dicts.note',
                 'user_dicts.confidence',
+                'user_dicts.editor_id',
             ]);
         //处理搜索
         if (!empty($request->get("keyword"))) {
@@ -89,7 +91,10 @@ class DictPreferenceController extends Controller
      */
     public function update(Request $request,  $id)
     {
-        //
+        $user = AuthApi::current($request);
+        if (!$user) {
+            return $this->error(__('auth.failed'), [], 401);
+        }
         $newData = $request->all();
         $word = UserDict::findOrFail($id);
         if (isset($newData['factors'])) {
@@ -101,7 +106,7 @@ class DictPreferenceController extends Controller
         if (isset($newData['confidence'])) {
             $word->confidence = $newData['confidence'];
         }
-
+        $word->editor_id = $user['user_uid'];
         $word->save();
         return $this->ok(new DictPreferenceResource($word));
     }

+ 13 - 9
api-v8/app/Http/Resources/DictPreferenceResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Api\UserApi;
 
 class DictPreferenceResource extends JsonResource
 {
@@ -16,15 +17,18 @@ class DictPreferenceResource extends JsonResource
     {
         $data = [
             'id' => strval($this->id),
-            'word'=>$this->word,
-            'count'=>$this->count,
-            'parent'=>$this->parent,
-            'note'=>$this->note,
-            'factors'=>$this->factors,
-            'confidence'=>$this->confidence,
-            'updated_at'=>$this->updated_at,
-            'creator_id'=>$this->creator_id,
-           ];
+            'word' => $this->word,
+            'count' => $this->count,
+            'parent' => $this->parent,
+            'note' => $this->note,
+            'factors' => $this->factors,
+            'confidence' => $this->confidence,
+            'updated_at' => $this->updated_at,
+            'creator_id' => $this->creator_id,
+        ];
+        if (!empty($this->editor_id)) {
+            $data['editor'] = UserApi::getByUuid($this->editor_id);
+        }
         return $data;
     }
 }