Merge pull request #269 from art-institute-of-chicago/fix/transript-o…

…utput Convert HTML paragraphs to new lines in transcripts [MA-167]
art-institute-of-chicago · Jun 10, 2024 · cfbd700 · cfbd700
2 parents 1d2451a + b2fcbc5
commit cfbd700
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/app/Helpers/StringHelpers.php b/app/Helpers/StringHelpers.php
@@ -287,4 +287,12 @@ public static function summation(array $array = [])
                 return implode(', ', $array) . ', and ' . $last;
         }
     }
+
+    public static function convertHtmlParagraphsToNewlines($text)
+    {
+        $return = preg_replace('/<p[^>]*>/', '', $text);
+        $return = str_replace('</p>', "\r\n", $return);
+        $return = preg_replace('/<br[^>]*>/', "\r\n", $return);
+        return $return;
+    }
 }
diff --git a/app/Models/Transformers/AudioTransformer.php b/app/Models/Transformers/AudioTransformer.php
@@ -4,6 +4,7 @@
 
 use A17\Twill\Models\Contracts\TwillModelContract;
 use App\Repositories\Serializers\OptionalKeyArraySerializer;
+use App\Helpers\StringHelpers;
 use League\Fractal\TransformerAbstract;
 
 class AudioTransformer extends TransformerAbstract
@@ -21,7 +22,7 @@ public function transform(TwillModelContract $audio)
                 'title' => $audio->title,
                 'nid' => (string) $audio->id, // Legacy from Drupal
                 'audio_file_url' => $audio->content,
-                'audio_transcript' => $audio->transcript,
+                'audio_transcript' => StringHelpers::convertHtmlParagraphsToNewlines($audio->transcript),
                 'track_title' => null, // Legacy from Drupal
             ])
         ];

diff --git a/app/Models/Transformers/AudioTranslationTransformer.php b/app/Models/Transformers/AudioTranslationTransformer.php
@@ -4,6 +4,7 @@
 
 use A17\Twill\Models\Contracts\TwillModelContract;
 use League\Fractal\TransformerAbstract;
+use App\Helpers\StringHelpers;
 
 class AudioTranslationTransformer extends TransformerAbstract
 {
@@ -17,7 +18,7 @@ public function transform(TwillModelContract $translation)
             'audio_file_url' => $translation->content,
             'audio_filemime' => null, // Legacy from Drupal
             'audio_filesize' => null, // Legacy from Drupal
-            'audio_transcript' => $translation->transcript,
+            'audio_transcript' => StringHelpers::convertHtmlParagraphsToNewlines($translation->transcript),
             'credits' => null, // Legacy from Drupal
         ];
     }

diff --git a/database/migrations/2024_02_27_225737_update_loan_objects_to_is_on_view.php b/database/migrations/2024_02_27_225737_update_loan_objects_to_is_on_view.php
@@ -3,8 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use App\Models\LoanObject;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     public function up(): void
     {
         LoanObject::query()->update(['is_on_view' => 1]);

diff --git a/database/migrations/2024_02_28_201141_add_default_value_for_loan_objects_is_on_view.php b/database/migrations/2024_02_28_201141_add_default_value_for_loan_objects_is_on_view.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     public function up(): void
     {
         Schema::table('loan_objects', function (Blueprint $table) {

diff --git a/database/migrations/2024_03_01_163217_add_published_to_selectors.php b/database/migrations/2024_03_01_163217_add_published_to_selectors.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Schema;
 use App\Models\Selector;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     public function up(): void
     {
         Schema::table('selectors', function (Blueprint $table) {

diff --git a/database/migrations/2024_03_01_164047_add_published_to_loan_objects.php b/database/migrations/2024_03_01_164047_add_published_to_loan_objects.php
@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\Schema;
 use App\Models\LoanObject;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     public function up(): void
     {
         Schema::table('loan_objects', function (Blueprint $table) {