The Broken commit: Need to pull replacement files live instead of storing data that could be out-of-date.

Author: mbusch3

assets/js/Components/ReviewFilesPage.js

@@ -416,7 +416,7 @@ export default function ReviewFilesPage({
           }
 
           const updatedFileData = response?.data?.lmsResponse?.content
-          let metadataObj = tempFile.metadata ? JSON.parse(tempFile.metadata) : {}
+          let metadataObj = tempFile?.metadata || {}
           console.log(updatedFileData)
           metadataObj.replacedByFileId = updatedFileData.id
 

src/Controller/FileItemsController.php

@@ -90,11 +90,19 @@ public function postFile(FileItem $file, Request $request, UtilityService $util,
             if (isset($responseContent['id'])) {
                 $file->setReplacementFile($responseContent);
             }
-
+            
+            $this->doctrine->getManager()->flush();
+            
             // Update report stats
             $report = $course->getUpdatedReport();
+            
+            $reportArr = $report->toArray();
+            $reportArr['files'] = $course->getFileItems();
+            $reportArr['issues'] = $course->getAllIssues();
+            $reportArr['contentItems'] = $course->getContentItems();
+            $reportArr['contentSections'] = $lmsFetch->getCourseSections($course, $user);
 
-            $this->doctrine->getManager()->flush();
+            $response->setData($reportArr);
 
             // Create response
             $apiResponse->addMessage('form.msg.success_replaced', 'success', 5000);
@@ -104,7 +112,7 @@ public function postFile(FileItem $file, Request $request, UtilityService $util,
             $apiResponse->setData([
                 'lmsResponse' => $lmsResponse,
                 'file' => ['pending' => false],
-                'report' => $report,
+                'report' => $reportArr,
             ]);
         } catch (\Exception $e) {
             $apiResponse->addError($e->getMessage());

src/Entity/FileItem.php

@@ -5,7 +5,7 @@
 use App\Repository\FileItemRepository;
 use App\Services\UtilityService;
 use Doctrine\ORM\Mapping as ORM;
-
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 #[ORM\Entity(repositoryClass: FileItemRepository::class)]
 class FileItem implements \JsonSerializable
@@ -139,16 +139,11 @@ public function setMetadata(?string $metadata): self
 
     public function setReplacementFile($fileData): self
     {
-        $replacement = [
-            'id' => $fileData['id'],
-            'fileName' => $fileData['display_name'],
-            'fileType' => $fileData['mime_class'],
-            'url' => $fileData['url'],
-        ];
-
-        $tempMetadata = json_decode($this->getMetadata(), true);
-        $tempMetadata['replacement'] = $replacement;
-        $this->setMetadata(json_encode($tempMetadata));
+        if(!isset($fileData['id'])) {
+            $tempMetadata = json_decode($this->getMetadata(), true);
+            $tempMetadata['replacement'] = $fileData['id'];
+            $this->setMetadata(json_encode($tempMetadata));
+        }
 
         return $this;
     }
@@ -157,7 +152,21 @@ public function getReplacementFile(): ?array
     {
         $metadata = json_decode($this->getMetadata(), true);
         if (isset($metadata['replacement'])) {
-            return $metadata['replacement'];
+            // Fetch the replacement file from the database using the LMS File ID
+            $lmsFileId = $metadata['replacement'];
+            $output = new ConsoleOutput();
+            $output->writeln("Fetching replacement file with LMS File ID: " . $lmsFileId);
+            
+            // TODO: Get ANOTHER file item IF it still exists in the database.
+            // This file does NOT have access to the ManagerRegistry (doctrine) but we need it to do
+            // something like this...
+
+            // $fileItemRepo = $this->doctrine->getManager()->getRepository(FileItem::class);
+            // $replacementFile = $fileItemRepo->findOneBy(['lmsFileId' => $lmsFileId]);
+
+            // if ($replacementFile) {
+            //     return $replacementFile;
+            // }
         }
 
         return [];
@@ -232,6 +241,13 @@ public function update($file): self
 
     public function jsonSerialize(): array
     {
+        // If there is a replacement file, verify that it still exists.
+        $replacementFileData = $this->getReplacementFile();
+        if(isset($replacementFileData['id'])) {
+            $output = new ConsoleOutput();
+            $output->writeln("File Item " . $this->getId() . " has a replacement file ID of " . $replacementFileData['id']);
+        }
+
         return [
             'id' => $this->getId(),
             'fileName' => $this->getFileName(),
@@ -246,6 +262,7 @@ public function jsonSerialize(): array
             'downloadUrl' => $this->getDownloadUrl(),
             'lmsUrl' => $this->getLmsUrl(),
             'metadata' => json_decode($this->getMetadata(), true),
+            'replacement' => $replacementFileData,
         ];
     }
 

src/Services/LmsPostService.php

@@ -76,15 +76,7 @@ public function saveFileToLms(FileItem $file, UploadedFile $uploadedFile, User $
             return;
         }
 
-        $lmsResponse = $lms->postFileItem($file, $uploadedFile->getClientOriginalName());
-
-        // If the file was successfully posted, create a new FileItem in the UDOIT database
-        $lmsResponseContent = $lmsResponse->getContent();
-        if(isset($lmsResponseContent['id'])) {
-            $lms->updateFileItem($file->getCourse(), $lmsResponseContent);
-        }
-
-        return $lmsResponse;
+        return $lms->postFileItem($file, $uploadedFile->getClientOriginalName());
     }
 
     public function replaceContent(Issue $issue, ContentItem $contentItem, $fullPageHtml = null)