Allow import translations with same keys in diffrent groups. (#155)

Author: caswd

src/Actions/SyncPhrasesAction.php

@@ -44,7 +44,7 @@ public static function execute(Translation $source, $key, $value, $locale, $file
         ], [
             'value' => (empty($value) ? null : $value),
             'parameters' => getPhraseParameters($value),
-            'phrase_id' => $translation->source ? null : $source->phrases()->where('key', $key)->first()?->id,
+            'phrase_id' => $translation->source ? null : $source->phrases()->where('key', $key)->where('group', $translationFile->name)->first()?->id,
         ]);
     }
 }

src/Console/Commands/ImportTranslationsCommand.php

@@ -139,7 +139,7 @@ public function syncMissingTranslations(Translation $source, string $locale): vo
         $source->load('phrases.translation', 'phrases.file');
 
         $source->phrases->each(function ($phrase) use ($translation, $locale) {
-            if (! $translation->phrases()->where('key', $phrase->key)->first()) {
+            if (! $translation->phrases()->where('key', $phrase->key)->where('group', $phrase->group)->first()) {
                 $fileName = $phrase->file->name.'.'.$phrase->file->extension;
 
                 if ($phrase->file->name === config('translations.source_language')) {

tests/Actions/SyncPhrasesActionTest.php

@@ -0,0 +1,79 @@
+<?php
+
+use Outhebox\TranslationsUI\Actions\SyncPhrasesAction;
+use Outhebox\TranslationsUI\Models\Language;
+use Outhebox\TranslationsUI\Models\Phrase;
+use Outhebox\TranslationsUI\Models\Translation;
+
+it('can sync phrases with same keys in different groups', function () {
+    // Setup
+    $english = Language::factory()
+        ->create([
+            'rtl' => false,
+            'code' => 'en',
+            'name' => 'English',
+        ]);
+
+    $dutch = Language::factory()
+        ->create([
+            'rtl' => false,
+            'code' => 'nl',
+            'name' => 'Nederlands',
+        ]);
+
+    $englishTranslation = Translation::factory()
+        ->source()
+        ->create([
+            'language_id' => $english->id,
+        ]);
+
+    $englighAuthorsTitle = Phrase::factory()->create([
+        'key' => 'title',
+        'translation_id' => $englishTranslation->id,
+        'group' => 'authors',
+        'value' => 'Authors', // Dutch: Schrijvers
+    ]);
+
+    $englighBooksTitle = Phrase::factory()->create([
+        'key' => 'title',
+        'translation_id' => $englishTranslation->id,
+        'group' => 'books',
+        'value' => 'Books', // Dutch: Boeken
+    ]);
+
+    Phrase::bootHasUuid(); // IDK why this is needed... without this we get an integrity constraint violation for empty uuid.
+
+    // When
+    SyncPhrasesAction::execute(
+        $englishTranslation,
+        'title',
+        'Schrijvers',
+        'nl',
+        'authors.php',
+    );
+
+    SyncPhrasesAction::execute(
+        $englishTranslation,
+        'title',
+        'Boeken',
+        'nl',
+        'books.php',
+    );
+
+    // Then
+    $dutchTranslation = $dutch->translation;
+    expect($dutchTranslation)->toBeInstanceOf(Translation::class);
+
+    $dutchPhrases = $dutchTranslation->phrases;
+    expect($dutchPhrases)->toHaveCount(2);
+
+    expect($dutchPhrases[0]->phrase_id)->toEqual($englighAuthorsTitle->id);
+    expect($dutchPhrases[0]->key)->toEqual($englighAuthorsTitle->key);
+    expect($dutchPhrases[0]->group)->toEqual($englighAuthorsTitle->group);
+    expect($dutchPhrases[0]->value)->toEqual('Schrijvers');
+
+    expect($dutchPhrases[1]->phrase_id)->toEqual($englighBooksTitle->id);
+    expect($dutchPhrases[1]->key)->toEqual($englighBooksTitle->key);
+    expect($dutchPhrases[1]->group)->toEqual($englighBooksTitle->group);
+    expect($dutchPhrases[1]->value)->toEqual('Boeken');
+});

tests/Commands/ImportTranslationsCommandTest.php

@@ -0,0 +1,50 @@
+<?php
+
+use Outhebox\TranslationsUI\Models\Language;
+use Outhebox\TranslationsUI\Models\Phrase;
+use Outhebox\TranslationsUI\Models\Translation;
+
+beforeEach(function () {
+    App::useLangPath(__DIR__.'lang_test');
+    createDirectoryIfNotExits(lang_path());
+});
+
+it('can import translations with same keys in diffent groups', function () {
+    // Given
+    $english = Language::factory()
+        ->create([
+            'rtl' => false,
+            'code' => 'en',
+            'name' => 'English',
+        ]);
+
+    $dutch = Language::factory()
+        ->create([
+            'rtl' => false,
+            'code' => 'nl',
+            'name' => 'Nederlands',
+        ]);
+
+    createPhpLanguageFile('en/authors.php', [
+        'title' => 'Authors'
+    ]);
+
+    createPhpLanguageFile('en/books.php', [
+        'title' => 'Books',
+    ]);
+
+    createPhpLanguageFile('nl/unrelated.php', []);
+
+    Phrase::bootHasUuid(); // IDK why this is needed... without this we get an integrity constraint violation for empty uuid.
+
+    // When
+    $this->artisan('translations:import')
+        ->assertExitCode(0);
+
+    // Then
+    $translation = $dutch->translation;
+    expect($translation)->toBeInstanceOf(Translation::class);
+
+    $phrases = $translation->phrases;
+    expect($phrases)->toHaveCount(2);
+});