-[x] Fix republish state issue in 1298

younginnovations · Apr 8, 2024 · 75dfb53 · 75dfb53
1 parent 0430333
commit 75dfb53
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 32 deletions.
diff --git a/app/Helpers/utils.php b/app/Helpers/utils.php
@@ -307,7 +307,7 @@ function removeSingleActivityXmlFromMergedActivitiesXml(SimpleXMLElement $merged
 
 if (!function_exists('getFileIdentifier')) {
     /**
-     * Returns the suffix of filename if syntax is: publisher_identifier-SUFFIX.xml
+     * Returns the suffix of filename if syntax is: publisher_identifier-SUFFIX.xml.
      *
      * @param string $filename
      * @return string

diff --git a/app/Http/Controllers/Admin/Organization/OrganizationController.php b/app/Http/Controllers/Admin/Organization/OrganizationController.php
@@ -160,7 +160,7 @@ public function destroy(DeleteOrganizationRequest $request, string $orgId): arra
 
             $organization->settings()->delete();
 
-            $activities = $organization->activities;
+            $activities = $organization->allActivities;
 
             foreach ($activities as $activity) {
                 $activity->delete();

diff --git a/app/IATI/Models/Organization/Organization.php b/app/IATI/Models/Organization/Organization.php
@@ -249,14 +249,6 @@ public function usersIncludingDeleted(): HasMany
         return $this->hasMany(User::class, 'organization_id', 'id')->withTrashed();
     }
 
-    /**
-     * @return HasOne
-     */
-    public function organizationPublished(): HasOne
-    {
-        return $this->hasOne(OrganizationPublished::class, 'organization_id', 'id');
-    }
-
     /**
      * @return HasOne
      */

diff --git a/app/IATI/Services/Organization/OrganizationService.php b/app/IATI/Services/Organization/OrganizationService.php
@@ -377,15 +377,15 @@ private function beginPublisherIdChangeWorkflow(array $orgData, array $settingsD
         $settings->timestamps = false;
         $settings->updateQuietly();
 
-        if (($org->status === 'published')) {
+        $orgPublished = $org->organizationPublished;
+
+        if ($org->is_published || count($orgPublished)) {
             $oldOrgFilename = "$oldPublisherId-organisation.xml";
             $newOrgFilename = "$publisherId-organisation.xml";
             $oldOrgFilenameMappedToNewOrgFilename = [$oldOrgFilename => $newOrgFilename];
 
             $this->renameOldFilesInS3($oldOrgFilenameMappedToNewOrgFilename, Enums::ORG_XML_BASE_PATH);
 
-            $orgPublished = $org->organizationPublished;
-
             $orgPublished->timestamps = false;
             $orgPublished->filename = $newOrgFilename;
             $orgPublished->updateQuietly();

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/webportal-app.css b/public/css/webportal-app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=19e3ae58597cb4b8b819b8f56a5b59ce",
+    "/js/app.js": "/js/app.js?id=9bf50b8766bac2eb61d7b294a0ed7f4d",
     "/js/script.js": "/js/script.js?id=486f329f14e1f080305e7c109ca928ac",
     "/js/webportal-script.js": "/js/webportal-script.js?id=fd5980061c5c73a9d216570039251afa",
     "/js/formbuilder.js": "/js/formbuilder.js?id=3ddb4d056b9896d95dfa2feefc2938ac",
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
-    "/css/webportal-app.css": "/css/webportal-app.css?id=03b487703698b0f46e8be13d3a7c9ecb",
-    "/css/app.css": "/css/app.css?id=c37dbfa1eafa64f765cd5306c9f48e03",
+    "/css/webportal-app.css": "/css/webportal-app.css?id=a6c5384389dbdd64d6070da5517a2fd8",
+    "/css/app.css": "/css/app.css?id=0f955effd92336d6215c1e2ec8ea0e1c",
     "/js/vendor.js": "/js/vendor.js?id=217ccbf7991cab71072e36f016dae36e"
 }