Merge branch 'refs/heads/peterguo-dev' into dev

app/Http/Controllers/API/FolderController.php

@@ -271,8 +271,10 @@ class FolderController extends Controller
 
 
         $objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
-        $folders = Folder::query()
-            ->select(['id', 'name'])
+        $folders = Folder::with(["namingRule" => function ($query) {
+            $query->select(['id', 'name', 'combination_rules']);
+        }])
+            ->select(['id', 'name', 'naming_rule_id'])
             ->where($objectWhere)
             ->when($folderId, fn($query) => $query->where("parent_id", $folderId))
             ->when(! $folderId, fn($query) => $query->where("parent_id", 0))

app/Models/Folder.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Models\Scopes\CompanyScope;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Folder extends Model
@@ -22,4 +23,9 @@ class Folder extends Model
     {
         return $this->hasMany(File::class)->orderByDesc("version");
     }
+
+    public function namingRule(): BelongsTo
+    {
+        return $this->belongsTo(NamingRule::class);
+    }
 }

app/Services/Folder/FoldersService.php

@@ -3,23 +3,12 @@
 namespace App\Services\Folder;
 
 use App\Models\Folder;
-use App\Repositories\CustomFieldRepository;
 
 class FoldersService
 {
-    private CustomFieldRepository $customFieldRepository;
-    public function __construct(CustomFieldRepository $customFieldRepository)
-    {
-        $this->customFieldRepository = $customFieldRepository;
-    }
-
     public function update(string $id, array $updatedData): void
     {
         $folder = Folder::query()->findOrFail($id);
-
-        if ($updatedData['naming_rule_id']) {
-            $updatedData['naming_rules'] = $this->customFieldRepository->keysByGroup($updatedData['naming_rule_id']);
-        }
         $folder->fill($updatedData);
         $folder->save();
     }

database/migrations/2024_12_20_170029_add_naming_rule_id_to_folder_table.php

@@ -14,7 +14,6 @@ return new class extends Migration
         Schema::table('folders', function (Blueprint $table) {
             //
             $table->integer('naming_rule_id')->default(null)->nullable();
-            $table->json('naming_rules')->default(null)->nullable();
         });
     }
 
@@ -26,7 +25,6 @@ return new class extends Migration
         Schema::table('folders', function (Blueprint $table) {
             //
             $table->dropColumn('naming_rule_id');
-            $table->dropColumn('naming_rules');
         });
     }
 };