ДЗ №3

Gemfile

@@ -7,6 +7,12 @@ gem 'rails', '~> 5.2.3'
 gem 'pg', '>= 0.18', '< 2.0'
 gem 'puma', '~> 3.11'
 gem 'bootsnap', '>= 1.1.0', require: false
+gem 'benchmark-ips'
+gem 'kalibera'
+gem 'activerecord-import'
+gem 'bullet'
+gem 'pghero'
+gem 'pg_query'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -17,10 +23,13 @@ group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'meta_request'
+  gem 'rack-mini-profiler'
 end
 
 group :test do
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'rspec-benchmark'
+  gem 'rails-controller-testing'
 end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -33,6 +33,8 @@ GEM
       activemodel (= 5.2.3)
       activesupport (= 5.2.3)
       arel (>= 9.0)
+    activerecord-import (1.0.8)
+      activerecord (>= 3.2)
     activestorage (5.2.3)
       actionpack (= 5.2.3)
       activerecord (= 5.2.3)
@@ -43,19 +45,31 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
+    benchmark-ips (2.8.4)
+    benchmark-malloc (0.2.0)
+    benchmark-perf (0.6.0)
+    benchmark-trend (0.4.0)
     bindex (0.6.0)
     bootsnap (1.4.2)
       msgpack (~> 1.0)
     builder (3.2.3)
+    bullet (6.1.4)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.0.1)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
+    diff-lcs (1.4.4)
     erubi (1.8.0)
     ffi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    google-protobuf (3.15.8)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    kalibera (0.1.1)
+      memoist (~> 0.11.0)
+      rbzip2 (~> 0.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -67,8 +81,14 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    memoist (0.11.0)
+    meta_request (0.7.2)
+      rack-contrib (>= 1.1, < 3)
+      railties (>= 3.0.0, < 7)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -77,8 +97,16 @@ GEM
     nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     pg (1.1.4)
+    pg_query (2.0.3)
+      google-protobuf (~> 3.15.5)
+    pghero (2.8.1)
+      activerecord (>= 5)
     puma (3.12.1)
     rack (2.0.6)
+    rack-contrib (2.3.0)
+      rack (~> 2.0)
+    rack-mini-profiler (2.3.2)
+      rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -94,6 +122,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -109,6 +141,33 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    rbzip2 (0.2.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-benchmark (0.6.0)
+      benchmark-malloc (~> 0.2)
+      benchmark-perf (~> 0.6)
+      benchmark-trend (~> 0.4)
+      rspec (>= 3.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
     ruby_dep (1.5.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -121,6 +180,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    uniform_notifier (1.14.2)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -134,13 +194,24 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-import
+  benchmark-ips
   bootsnap (>= 1.1.0)
+  bullet
   byebug
+  kalibera
   listen (>= 3.0.5, < 3.2)
+  meta_request
   pg (>= 0.18, < 2.0)
+  pg_query
+  pghero
   puma (~> 3.11)
+  rack-mini-profiler
   rails (~> 5.2.3)
-  tzinfo-data
+  rails-controller-testing
+  rspec
+  rspec-benchmark
+  rspec-rails
   web-console (>= 3.3.0)
 
 RUBY VERSION

app/controllers/trips_controller.rb

@@ -2,6 +2,6 @@ class TripsController < ApplicationController
   def index
     @from = City.find_by_name!(params[:from])
     @to = City.find_by_name!(params[:to])
-    @trips = Trip.where(from: @from, to: @to).order(:start_time)
+    @trips = Trip.where(from: @from, to: @to).order(:start_time).includes(bus: [:services])
   end
 end

app/models/bus.rb

@@ -13,7 +13,8 @@ class Bus < ApplicationRecord
   ].freeze
 
   has_many :trips
-  has_and_belongs_to_many :services, join_table: :buses_services
+  has_many :buses_services
+  has_and_belongs_to_many :services, through: :buses_services
 
   validates :number, presence: true, uniqueness: true
   validates :model, inclusion: { in: MODELS }

app/models/buses_service.rb

@@ -0,0 +1,7 @@
+class BusesService < ApplicationRecord
+  belongs_to :bus
+  belongs_to :service
+
+  validates :bus, presence: true
+  validates :service, presence: true
+end

app/models/service.rb

@@ -12,7 +12,8 @@ class Service < ApplicationRecord
     'Можно не печатать билет',
   ].freeze
 
-  has_and_belongs_to_many :buses, join_table: :buses_services
+  has_many :buses_services
+  has_and_belongs_to_many :buses, through: :buses_services
 
   validates :name, presence: true
   validates :name, inclusion: { in: SERVICES }

app/services/reload_json.rb

@@ -0,0 +1,81 @@
+class ReloadJson
+  def initialize(file_name)
+    @file_name = file_name
+  end
+
+  def call
+    json = JSON.parse(File.read(@file_name))
+    trips = []
+    buses = {}
+    services = {}
+    cities = {}
+    bus_services = {}
+
+    ActiveRecord::Base.transaction do
+      City.delete_all
+      Bus.delete_all
+      Service.delete_all
+      Trip.delete_all
+      BusesService.delete_all
+
+      json.each do |trip|
+        from = find_or_new_city!(cities, trip['from'])
+        to = find_or_new_city!(cities, trip['to'])
+
+        bus = buses[trip['bus']['number']]
+        unless bus
+          bus = Bus.new(number: trip['bus']['number'])
+          bus.model = trip['bus']['model']
+          trip['bus']['services'].each do |service|
+            s = find_or_new_service!(services, service)
+            find_or_new_bus_service!(bus_services, bus, s)
+          end
+          buses[trip['bus']['number']] = bus
+        end
+
+        trips << Trip.new(
+          from: from,
+          to: to,
+          bus: bus,
+          start_time: trip['start_time'],
+          duration_minutes: trip['duration_minutes'],
+          price_cents: trip['price_cents']
+        )
+      end
+
+      City.import! cities.values
+      Service.import! services.values
+      Bus.import! buses.values
+      BusesService.import! bus_services.values.map(&:values).flatten
+      Trip.import! trips
+    end
+  end
+
+  def find_or_new_city!(cities, name)
+    found = cities[name]
+    unless found
+      found = City.new(name: name)
+      cities[name] = found
+    end
+    found
+  end
+
+  def find_or_new_service!(services, name)
+    found = services[name]
+    unless found
+      found = Service.new(name: name)
+      services[name] = found
+    end
+    found
+  end
+
+  def find_or_new_bus_service!(bus_services, bus, service)
+    found = bus_services.dig(bus, service)
+    unless found
+      found = BusesService.new(bus: bus, service: service)
+      bus_services[bus] = {} unless bus_services[bus]
+      bus_services[bus][service] = found
+    end
+    found
+  end
+end

app/views/trips/index.html.erb

@@ -2,15 +2,24 @@
   <%= "Автобусы #{@from.name} – #{@to.name}" %>
 </h1>
 <h2>
-  <%= "В расписании #{@trips.count} рейсов" %>
+  <%= "В расписании #{@trips.load.size} рейсов" %>
 </h2>
 
 <% @trips.each do |trip| %>
   <ul>
-    <%= render "trip", trip: trip %>
+    <li><%= "Отправление: #{trip.start_time}" %></li>
+    <li><%= "Прибытие: #{(Time.parse(trip.start_time) + trip.duration_minutes.minutes).strftime('%H:%M')}" %></li>
+    <li><%= "В пути: #{trip.duration_minutes / 60}ч. #{trip.duration_minutes % 60}мин." %></li>
+    <li><%= "Цена: #{trip.price_cents / 100}р. #{trip.price_cents % 100}коп." %></li>
+    <li><%= "Автобус: #{trip.bus.model} №#{trip.bus.number}" %></li>
     <% if trip.bus.services.present? %>
-      <%= render "services", services: trip.bus.services %>
-    <% end %>
+      <li>Сервисы в автобусе:</li>
+      <ul>
+        <% trip.bus.services.each do |service| %>
+          <li><%= "#{service.name}" %></li>
+      <% end %>
+      </ul>
+  <% end %>
   </ul>
-  <%= render "delimiter" %>
+  ====================================================
 <% end %>