Simplify and finalise the Translation schema and service

Author: janwerkhoven

app/controllers/v1/admin/translation_events_controller.rb

@@ -41,21 +41,14 @@ def serializer_class
         V1::Admin::TranslationSerializer
       end
 
-      def permitted_includes
-        %i[
-          translation_events
-        ]
-      end
-
       def creatable_attributes
         %i[
           location
           language
           native
           english
-          needs_review
-          review_code
-          custom_review_message
+          english_before
+          status
         ]
       end
 

app/controllers/v1/admin/translations_controller.rb

@@ -14,7 +14,7 @@ def create
       end
 
       def update
-        forbidden
+        allow_update
       end
 
       def destroy
@@ -40,9 +40,11 @@ def permitted_filters
 
       def creatable_attributes
         %i[
-          location
           language
+          location
           english
+          english_before
+          status
         ]
       end
     end

app/controllers/v1/public/translation_events_controller.rb

@@ -17,7 +17,7 @@ def perform(record)
     puts response
     puts '======'
     first_translation = response[:translations].first
-    record.update!(native: first_translation)
+    record.update!(native: first_translation, status: 'to-review')
     puts 'translate_job end'
     puts '======'
   end

app/controllers/v1/public/translations_controller.rb

@@ -1,25 +1,23 @@
 class Translation < ApplicationRecord
-  has_many :translation_events, dependent: :destroy
-
-  validates :english, uniqueness: { scope: %i[language] }
-  validates :review_code, inclusion: {
-    in: [
-      nil,
-      'untranslated',
-      'robot-translated',
-      'source-changed',
-      'custom'
+  validates :location, uniqueness: { scope: %i[language] }
+  validates :status, inclusion: {
+    in: %w[
+      to-translate
+      to-update
+      to-review
+      done
     ]
   }
 
-  after_create :translate
+  # after_create :translate
 
-  def translate
-    puts '------'
-    puts 'after_create'
-    puts "language: #{language}"
-    puts "phrase: #{english}"
-    puts '------'
-    TranslateJob.perform_later(self) if native.nil?
-  end
+  # def translate
+  #   puts '------'
+  #   puts 'after_create'
+  #   puts "language: #{language}"
+  #   puts "location: #{location}"
+  #   puts "english: #{english}"
+  #   puts '------'
+  #   TranslateJob.perform_later(self) if native.nil?
+  # end
 end

app/jobs/translate_job.rb

@@ -5,11 +5,8 @@ class TranslationSerializer < ApplicationSerializer
                  :language,
                  :native,
                  :english,
-                 :needs_review,
-                 :review_code,
-                 :custom_review_message
-
-      has_many :translation_events, if: requested?('translation_events')
+                 :english_before,
+                 :status
     end
   end
 end

app/models/translation.rb

@@ -43,33 +43,33 @@ def translation
     return puts 'FAIL: target_lang not supported' unless supported_languages.include?(@target_lang.to_sym)
     return puts 'FAIL: source_lang not supported' unless supported_languages.include?(@source_lang.to_sym)
 
-    {
-      success: true,
-      translations: ['Ich bin foo bar', 'Meine Name is foo bar', 'Ich heise foo bar']
-    }
-
-    # response = Faraday.post(url) do |req|
-    #   req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-    #   req.headers['Authorization'] = "DeepL-Auth-Key #{api_key}"
-    #   req.body = URI.encode_www_form(data)
-    # end
+    response = Faraday.post(url) do |req|
+      req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+      req.headers['Authorization'] = "DeepL-Auth-Key #{api_key}"
+      req.body = URI.encode_www_form(data)
+    end
 
-    # return puts 'FAIL: request failed' unless response.status == 200
+    return puts 'FAIL: request failed' unless response.status == 200
 
-    # body = JSON.parse(response.body)
+    body = JSON.parse(response.body)
 
-    # return puts 'FAIL: no translations key' unless body.key?('translations')
+    # The response body will look something like:
+    # {"translations"=>[{"detected_source_language"=>"EN", "text"=>"Sie sind schwul"}]}
+    # Note how the translations key is an array which may return multiple translations.
 
-    # translations = body['translations']
+    return puts 'FAIL: no translations key' unless body.key?('translations')
 
-    # return puts 'FAIL: no translations' if translations.empty?
+    translations = body['translations'].map { |t| t['text'] }
 
-    # translation = translations.first['text']
+    # Here we map all suggested translations to a flat array like:
+    # ['Sie sind schwul', 'Suggestion 2']
 
-    # puts "translations: #{translation}"
-    # puts '---'
+    puts "translations: #{translations}"
 
-    # translation
+    {
+      success: true,
+      translations: translations
+    }
   end
 
   def url
@@ -80,7 +80,8 @@ def data
     {
       text: @phrase,
       target_lang: @target_lang,
-      source_lang: @source_lang
+      source_lang: @source_lang,
+      formality: 'prefer_more'
     }
   end
 

app/models/translation_event.rb

@@ -35,7 +35,6 @@
       resources :sessions
       resources :simulation_requests, path: '/simulation-requests'
       resources :translations
-      resources :translation_events, path: '/translation-events'
       resources :uses
       resources :webinar_attendees, path: '/webinar-attendees'
       resources :webinars
@@ -80,7 +79,6 @@
       resources :qualities
       resources :sessions
       resources :translations
-      resources :translation_events, path: '/translation-events'
       resources :use_images, path: '/use-images'
       resources :users
       resources :uses

app/serializers/v1/admin/translation_event_serializer.rb

@@ -0,0 +1,18 @@
+class MakeLocationUniqueOnTranslationsPerLanguage < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :translations, :needs_review
+    remove_column :translations, :review_code
+    remove_column :translations, :custom_review_message
+
+    add_column :translations, :status, :string
+    add_column :translations, :history, :text
+    add_column :translations, :last_english_approved, :text
+
+    remove_index :translations, name: 'unique_translation_index'
+
+    add_index :translations,
+              %i[language location],
+              unique: true,
+              name: 'unique_location_per_language_index'
+  end
+end

app/serializers/v1/admin/translation_serializer.rb

@@ -0,0 +1,6 @@
+class RenameAndRemoveFromTranslation < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :translations, :history
+    rename_column :translations, :last_english_approved, :english_before
+  end
+end

app/serializers/v1/public/translation_event_serializer.rb

@@ -0,0 +1,5 @@
+class DropTranslationEvents < ActiveRecord::Migration[6.1]
+  def change
+    drop_table :translation_events
+  end
+end

app/services/translate_service.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_07_063955) do
+ActiveRecord::Schema.define(version: 2023_02_25_230018) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -489,25 +489,16 @@
     t.index ["slug"], name: "index_tags_on_slug", unique: true
   end
 
-  create_table "translation_events", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "translation_id"
-    t.string "code"
-    t.string "person"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
   create_table "translations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "location"
     t.string "language"
     t.string "native"
     t.string "english"
-    t.boolean "needs_review"
-    t.string "review_code"
-    t.string "custom_review_message"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["language", "english"], name: "unique_translation_index", unique: true
+    t.string "status"
+    t.text "english_before"
+    t.index ["language", "location"], name: "unique_location_per_language_index", unique: true
     t.index ["language"], name: "index_translations_on_language"
     t.index ["location"], name: "index_translations_on_location"
   end