Merge remote-tracking branch 'upstream/master'

Dockerfile

@@ -46,6 +46,9 @@ ENV RACK_ENV $env
 RUN echo "Running \"bundle install $bundle_opts\" with environment set to \"$env\"..." && \
     bundle install $bundle_opts
 
+# generate sitemap
+RUN bundle exec sitemap:refresh:no_ping
+
 EXPOSE 3000
 
 ENTRYPOINT ["bundle", "exec"]

app/serializers/v3/word_serializer.rb

@@ -38,15 +38,13 @@ class V3::WordSerializer < V3::ApplicationSerializer
   end
 
   has_one :translation, serializer: V3::TranslationSerializer do
-    translation = object.public_send("#{scope[:language] || 'en'}_translations").first
+     translation = object.public_send("#{scope[:language] || 'en'}_translations").first
 
-    translation.present? ? translation : object.en_translations.first
+     translation.present? ? translation : object.en_translations.first
   end
 
-  has_one :transliteration, serializer: V3::TransliterationSerializer do
-    transliteration = object.public_send("#{scope[:language] || 'en'}_transliterations").first
-
-    transliteration.present? ? transliteration : object.en_transliterations.first
+  has_one :transliteration, serializer: V3::TranslationSerializer do
+    object.en_translations.first
   end
 
   def class_name

build.sh

@@ -8,5 +8,5 @@ if [ "$environment" == "development" ]; then
   docker-compose build #--no-cache
   ./save-artifacts.sh $artifacts
 else
-  docker-compose -f docker-compose.yml -f docker-compose.$environment.yml build
+  docker-compose -f docker-compose.$environment.yml build
 fi

config/database.yml

@@ -27,9 +27,13 @@ default: &default
 
 development:
   <<: *default
+  adapter: postgresql
+  encoding: unicode
+  database: quran_dev
 
 test:
   <<: *default
 
 production:
   <<: *default
+  url: <%= ENV['DATABASE_URL'] %>

docker-compose.production.yml

@@ -6,6 +6,7 @@ services:
       args:
         - env=production
         - bundle_opts=--without development test --deployment --clean
+    image: qurancomapi_api:prod-latest
     environment:
       - SECRET_KEY_BASE=abcdefa
 

docker-compose.yml

@@ -1,13 +1,24 @@
 version: '3'
 services:
   api:
+    build:
+      context: .
+      args:
+        - env=development
+        - bundle_opts=--without test
+    image: qurancomapi_api:dev-latest
+    volumes:
+      - .:/app
     ports:
       - "3000:3000"
     environment:
       - DATABASE_URL=postgres://quran_dev:quran_password@postgres:5432/quran_db
       - ELASTICSEARCH_HOST=elasticsearch
       - SENTRY_DSN=
       - SECRET_KEY_BASE=abcdefa
+    depends_on:
+      - postgres
+      - elasticsearch
   postgres:
     image: qurandb:v102
     ports:

docker/README.md

@@ -34,4 +34,4 @@ To rebuild the image for production:
 
     RAILS_ENV=production ./build.sh    
 
-Push the resulting image to a registry so that a `docker stack deploy` finds it.
+Then tag and push the resulting image to a registry so that a `docker stack deploy` finds it.

lib/tasks/one_time.rake

@@ -1,4 +1,24 @@
 namespace :one_time do
+  task replace_wbw_translation: :environment do
+    require 'csv'
+    changed = []
+
+    data = CSV.open("final_wbw_translation.csv").read
+
+    data[1..data.size].each do |row|
+      word = Word.find(row[0])
+      if word.en_translations.first.text != row[2].to_s.strip
+        changed[word.id] = {current: word.en_translations.first.text, new: row[2].to_s.strip}
+      end
+
+      word.en_translations.first.update_column :text, row[2].to_s.strip
+    end
+
+    File.open("wbw_report", 'wb') do |file|
+      file << changed.to_json
+    end
+  end
+
   task fix_tafsir: :environment do
     Tafsir.includes(:verse).each do |tafsir|
       tafsir.update_attribute :verse_key, tafsir.verse.verse_key