done

Author: codingmaster009

app/Services/DomainService.php

@@ -33,25 +33,27 @@ public function resolve ( array $data = [], bool $defaults = true, bool $filled
     }
     public function clean ( array $items = [] ) {
 
-        collect($items)->each(fn($item) => $this->domainRepository->query()->where('dest', $item['dest'])->get()->each(fn($d) =>
-            $this->remove($d)
-        ));
+        collect($items)->each(fn($item) =>
+            $this->domainRepository->query()->where('dest', $item['dest'])->get()->each(fn($d) => $this->remove($d))
+        );
 
     }
-    public function remove ( Domain $domain ) {
+    public function flush () {
 
-        $this->vercelService->setProject($domain->dest)->deleteDomain($domain->name);
-        $this->cloudflareService->setZone($domain->zone?->provider_id)->deleteSubDomain($domain->provider_id ?? $domain->name);
-        $this->domainRepository->forceDelete($domain->id);
+        $this->zoneService->flush();
+        $this->domainRepository->query()->get()->each(fn($d) => $this->remove($d));
 
     }
     public function sync ( Domain $domain ) {
 
-        $this->domainRepository->query()->where('id', '!=', $domain->id)->where('dest', $domain->dest)->get()->each(fn($d) =>
-            $this->remove($d)
-        );
-        
-        $this->deleteCache();
+        $this->domainRepository->query()->where('id', '!=', $domain->id)->where('dest', $domain->dest)->get()->each(fn($d) => $this->remove($d));
+
+    }
+    public function remove ( Domain $domain ) {
+
+        $this->vercelService->setProject($domain->dest)->deleteDomain($domain->name);
+        $this->cloudflareService->setZone($domain->zone?->provider_id)->deleteSubDomain($domain->provider_id ?? $domain->name);
+        $this->delete($domain->id);
 
     }
     public function validate ( Zone $zone, string $name ) {

app/Services/StoreService.php

@@ -19,6 +19,12 @@ public function subscribe ( Store $store, array $data = [] ) {
         if ( !$this->subscriptionService->subscribeOrRenew($store, $data) ) throwError('subscription', 'subscription failed');
         if ( !$this->withTenant($store->id, callback: fn() => $this->domainService->apply($data)) ) throwError('domains', 'invalid domains');
 
+    }
+    public function flush ( Store $store ) {
+
+        $this->withTenant($store->id, callback: fn() => $this->domainService->flush());
+        parent::delete($store->id);
+
     }
     public function store ( array $data = [], array $scopes = [] ) {
 
@@ -40,12 +46,18 @@ public function update ( int $id, array $data = [], array $scopes = [] ) {
 
         return $this->storeRepository->dbTransaction(function () use ( $id, $data, $scopes ) {
 
-            $store = parent::find($id, $scopes);
+            $store = $this->find($id, $scopes);
             $this->subscribe($store, $data);
             return parent::update($id, $data, $scopes);
 
         });
 
+    }
+    public function delete ( int $id, array $scopes = [] ) {
+        
+        $this->runJob([static::class, 'flush'], [$this->find($id, $scopes)]);
+        return success();
+
     }
     public function renew ( int $id, array $scopes = [] ) {
 

app/Services/ZoneService.php

@@ -27,24 +27,28 @@ public function current () {
         $zone = store()?->zone;
         return !$zone ? $this->parent() : ($zone->isValid() ? $zone : null);
 
+    }
+    public function flush () {
+
+        $this->zoneRepository->query()->get()->each(fn($z) => $this->remove($z));
+
+    }
+    public function sync ( Zone $zone ) {
+
+        $this->zoneRepository->query()->where('id', '!=', $zone->id)->get()->each(fn($z) => $this->remove($z));
+
     }
     public function remove ( Zone $zone ) {
 
         $this->vercelService->deleteDomain($zone->name);
 
         $zone->domains?->each(function($domain) {
             $this->vercelService->setProject($domain->dest)->deleteDomain($domain->name);
-            $this->domainRepository->forceDelete($domain->id);
+            $this->delete($domain->id);
         });
 
         $this->cloudflareService->deleteDomain($zone->provider_id ?? $zone->name);
-        $this->zoneRepository->forceDelete($zone->id);
-
-    }
-    public function sync ( Zone $zone ) {
-
-        $this->zoneRepository->query()->where('id', '!=', $zone->id)->get()->each(fn($z) => $this->remove($z));
-        $this->deleteCache();
+        $this->delete($zone->id);
 
     }
     public function validate ( string $name ) {

database/migrations/2024_05_14_234216_create_zones_table.php

@@ -11,15 +11,17 @@ public function up () {
         Schema::create('zones', function (Blueprint $table) {
             $table->id();
             $table->integer('store_id')->default(0);
-            $table->string('name')->unique();
+            $table->string('provider_id')->nullable();
+            $table->string('name');
             $table->string('ns1')->nullable();
             $table->string('ns2')->nullable();
-            $table->string('provider_id')->nullable();
             $table->enum('type', ['internal', 'external'])->default('internal');
             $table->enum('status', ['pending', 'verified', 'failed'])->default('verified');
             $table->boolean('active')->default(true);
             $table->timestamps();
             $table->softDeletes();
+
+            $table->unique(['name', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_14_234217_create_domains_table.php

@@ -13,14 +13,14 @@ public function up () {
             $table->integer('store_id')->default(0);
             $table->integer('zone_id')->default(0);
             $table->string('provider_id')->nullable();
-            $table->string('name')->unique();
-            $table->enum('dest', ['client', 'admin', 'vendor', 'blog', 'app', 'api', 'cdn'])->default('client');
+            $table->string('name');
+            $table->enum('dest', ['client', 'admin', 'vendor', 'delivery', 'affiliate', 'blog', 'app', 'api', 'cdn'])->default('client');
             $table->enum('status', ['pending', 'verified', 'failed'])->default('verified');
             $table->boolean('active')->default(true);
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['zone_id', 'name']);
+            $table->unique(['zone_id', 'name', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_14_234220_create_users_table.php

@@ -46,7 +46,7 @@ public function up () {
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['store_id', 'email']);
+            $table->unique(['store_id', 'email', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_14_234235_create_level_users_table.php

@@ -17,7 +17,7 @@ public function up () {
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['store_id', 'level_id', 'user_id']);
+            $table->unique(['store_id', 'level_id', 'user_id', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_14_234235_create_levels_table.php

@@ -34,7 +34,7 @@ public function up () {
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['store_id', 'rank']);
+            $table->unique(['store_id', 'rank', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_24_105723_create_coupons_table.php

@@ -43,7 +43,7 @@ public function up () {
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['store_id', 'code']);
+            $table->unique(['store_id', 'code', 'deleted_at']);
         });
 
     }

database/migrations/2024_05_24_105725_create_gift_codes_table.php

@@ -25,7 +25,7 @@ public function up () {
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['store_id', 'code']);
+            $table->unique(['store_id', 'code', 'deleted_at']);
         });
 
     }