+challenge/ +├── front/ # フロントエンド (Next.js / TypeScript) +│ ├── app/ +│ ├── dot.env # 共有用環境変数ファイル +│ ├── Dockerfile # 開発環境用Dockerfile +│ └── ... +└── api/ # バックエンド (Ruby on Rails API) + ├── app/ + ├── dot.env # 共有用環境変数ファイル + ├── Dockerfile # 開発環境用Dockerfile + ├── Dockerfile.prd # Cloud Run用Dockerfile + └── ... +├── Makefile # ビルド・起動コマンド群 +├── compose.yml # 開発用docker compose +├── compose.test.yml # テスト用docker compose +-* Database initialization +## 開発環境構築手順について +```bash +cd coding-challenge/serverside_challenge_2/challenge +cp api/dot.env api/.env +cp front/dot.env front/.env -* How to run the test suite +make build +make up +make api-bash +rails db:migrate:reset db:seed +``` -* Services (job queues, cache servers, search engines, etc.) +## 補足 +- このリポジトリは課題提出用のため、`service.yaml`や`GithubActions`などの構成ファイルは作成しておりません。 +- `Cloud Run`へは手動デプロイを実施しております。 +- `docker build -f Dockerfile.prd --platform linux/amd64 -t (GARのリンク) .` でイメージをビルド +- `docker push (GARのリンク):latest` でビルドしたイメージにlatestタグをつけてGARにプッシュ +- `Cloud RunのUIから環境変数の設定および`Image`の指定をしております。` -* Deployment instructions - -* ... +- 各機能実装時の記録としてプルリクエストを随時作成しております。 +- 確認手順などはプルリクエストへ詳細に記載させていただいております。 diff --git a/serverside_challenge_2/challenge/api/.dockerignore b/serverside_challenge_2/challenge/api/.dockerignore new file mode 100644 index 000000000..35ff861cf --- /dev/null +++ b/serverside_challenge_2/challenge/api/.dockerignore @@ -0,0 +1,13 @@ +/.bundle/ +/.dockerignore +/.git/ +/.git* +/.ruby-version +/README.md +/config/master.key +/log/ +/node_modules/ +/storage/ +/tmp/ +/vendor/bundle/ +/public/uploads/ diff --git a/serverside_challenge_2/challenge/.gitattributes b/serverside_challenge_2/challenge/api/.gitattributes similarity index 100% rename from serverside_challenge_2/challenge/.gitattributes rename to serverside_challenge_2/challenge/api/.gitattributes diff --git a/serverside_challenge_2/challenge/.gitignore b/serverside_challenge_2/challenge/api/.gitignore similarity index 97% rename from serverside_challenge_2/challenge/.gitignore rename to serverside_challenge_2/challenge/api/.gitignore index 88381219c..b6162a533 100644 --- a/serverside_challenge_2/challenge/.gitignore +++ b/serverside_challenge_2/challenge/api/.gitignore @@ -27,3 +27,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key +.env +.env.test diff --git a/serverside_challenge_2/challenge/api/.rubocop.yml b/serverside_challenge_2/challenge/api/.rubocop.yml new file mode 100644 index 000000000..22a3c5987 --- /dev/null +++ b/serverside_challenge_2/challenge/api/.rubocop.yml @@ -0,0 +1,33 @@ +inherit_gem: + rubocop-shopify: rubocop.yml + +plugins: + - rubocop-rails + +Style/MethodCallWithoutArgsParentheses: + Enabled: true + +Style/StringLiterals: + EnforcedStyle: single_quotes + +Rails/LexicallyScopedActionFilter: + Enabled: false + +Style/ClassAndModuleChildren: + Enabled: false + +Style/WordArray: + EnforcedStyle: percent + +AllCops: + SuggestExtensions: false + Exclude: + - 'db/**/*' + - 'lib/tasks/**/*' + - 'config/application.rb' + - 'config/environments/**/*' + - 'config/initializers/**/*' + - 'bin/**/*' + - 'vendor/**/*' + - 'Rakefile' + - 'config.ru' diff --git a/serverside_challenge_2/challenge/.ruby-version b/serverside_challenge_2/challenge/api/.ruby-version similarity index 100% rename from serverside_challenge_2/challenge/.ruby-version rename to serverside_challenge_2/challenge/api/.ruby-version diff --git a/serverside_challenge_2/challenge/Dockerfile b/serverside_challenge_2/challenge/api/Dockerfile similarity index 100% rename from serverside_challenge_2/challenge/Dockerfile rename to serverside_challenge_2/challenge/api/Dockerfile diff --git a/serverside_challenge_2/challenge/api/Dockerfile.prd b/serverside_challenge_2/challenge/api/Dockerfile.prd new file mode 100644 index 000000000..10f5d1b73 --- /dev/null +++ b/serverside_challenge_2/challenge/api/Dockerfile.prd @@ -0,0 +1,34 @@ +FROM ruby:3.1.2-slim-bullseye AS base + +ENV LANG=C.UTF-8 \ + RAILS_ENV="production" \ + BUNDLE_DEPLOYMENT="1" \ + BUNDLE_PATH="/usr/local/bundle" +WORKDIR /app + +FROM base AS builder + +RUN apt-get update -qq && \ + apt-get install -y build-essential libpq-dev && \ + rm -rf /var/lib/apt/lists/* + +COPY Gemfile Gemfile.lock ./ +RUN bundle install --jobs "$(nproc)" --without development test && \ + rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git + +COPY . . + +FROM base AS runner + +RUN apt-get update -qq && \ + apt-get install -y libpq-dev && \ + rm -rf /var/lib/apt/lists/* + +COPY --from=builder /usr/local/bundle /usr/local/bundle +COPY --from=builder /app /app +COPY db/csv /app/db/csv + +RUN chmod +x bin/start.sh + +EXPOSE ${PORT:-8080} +CMD ["bin/start.sh"] diff --git a/serverside_challenge_2/challenge/Gemfile b/serverside_challenge_2/challenge/api/Gemfile similarity index 67% rename from serverside_challenge_2/challenge/Gemfile rename to serverside_challenge_2/challenge/api/Gemfile index 43bf67fe3..4a65320f8 100644 --- a/serverside_challenge_2/challenge/Gemfile +++ b/serverside_challenge_2/challenge/api/Gemfile @@ -1,16 +1,18 @@ -source "https://rubygems.org" +# frozen_string_literal: true + +source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.2" +ruby '3.1.2' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.0.8" +gem 'rails', '~> 7.0.8' # Use postgresql as the database for Active Record -gem "pg", "~> 1.1" +gem 'pg', '~> 1.1' # Use the Puma web server [https://github.com/puma/puma] -gem "puma", "~> 5.0" +gem 'puma', '~> 5.0' # Build JSON APIs with ease [https://github.com/rails/jbuilder] # gem "jbuilder" @@ -25,10 +27,10 @@ gem "puma", "~> 5.0" # gem "bcrypt", "~> 3.1.7" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Reduces boot times through caching; required in config/boot.rb -gem "bootsnap", require: false +gem 'bootsnap', require: false # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" @@ -38,7 +40,12 @@ gem "bootsnap", require: false group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem - gem "debug", platforms: %i[ mri mingw x64_mingw ] + gem 'debug', platforms: [:mri, :mingw, :x64_mingw] + gem 'rubocop', require: false + gem 'rubocop-rails', require: false + gem 'rubocop-shopify', require: false + gem 'annotate', require: false + gem 'pry-rails' end group :development do @@ -46,3 +53,13 @@ group :development do # gem "spring" end +group :test do + gem 'factory_bot_rails' + gem 'shoulda-matchers', '~> 6.0' + gem 'shoulda-context', '~> 3.0.0.rc1' + gem 'minitest-power_assert' + gem 'faker' + gem 'mocha' +end + +gem 'rack-cors' diff --git a/serverside_challenge_2/challenge/Gemfile.lock b/serverside_challenge_2/challenge/api/Gemfile.lock similarity index 68% rename from serverside_challenge_2/challenge/Gemfile.lock rename to serverside_challenge_2/challenge/api/Gemfile.lock index a47fb85f5..92966c28f 100644 --- a/serverside_challenge_2/challenge/Gemfile.lock +++ b/serverside_challenge_2/challenge/api/Gemfile.lock @@ -66,9 +66,14 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) + ast (2.4.3) bootsnap (1.18.3) msgpack (~> 1.2) builder (3.2.4) + coderay (1.1.3) concurrent-ruby (1.2.3) crass (1.0.6) date (3.3.4) @@ -76,6 +81,13 @@ GEM irb (~> 1.10) reline (>= 0.3.8) erubi (1.12.0) + factory_bot (6.5.5) + activesupport (>= 6.1.0) + factory_bot_rails (6.5.1) + factory_bot (~> 6.5) + railties (>= 6.1.0) + faker (3.5.2) + i18n (>= 1.8.11, < 2) globalid (1.2.1) activesupport (>= 6.1) i18n (1.14.1) @@ -84,6 +96,9 @@ GEM irb (1.11.2) rdoc reline (>= 0.4.2) + json (2.15.1) + language_server-protocol (3.17.0.5) + lint_roller (1.1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -96,6 +111,11 @@ GEM method_source (1.0.0) mini_mime (1.1.5) minitest (5.22.2) + minitest-power_assert (0.3.1) + minitest + power_assert (>= 1.1) + mocha (2.7.1) + ruby2_keywords (>= 0.0.5) msgpack (1.7.2) net-imap (0.4.10) date @@ -111,13 +131,26 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) + parallel (1.27.0) + parser (3.3.9.0) + ast (~> 2.4.1) + racc pg (1.5.4) + power_assert (2.0.5) + prism (1.6.0) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.11) + pry (>= 0.13.0) psych (5.1.2) stringio puma (5.6.8) nio4r (~> 2.0) racc (1.7.3) rack (2.2.8) + rack-cors (2.0.2) + rack (>= 2.0.0) rack-test (2.1.0) rack (>= 1.3) rails (7.0.8) @@ -148,16 +181,48 @@ GEM rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) + rainbow (3.1.1) rake (13.1.0) rdoc (6.6.2) psych (>= 4.0.0) + regexp_parser (2.11.3) reline (0.4.2) io-console (~> 0.5) + rubocop (1.81.1) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.47.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.47.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-rails (2.33.4) + activesupport (>= 4.2.0) + lint_roller (~> 1.1) + rack (>= 1.1) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) + rubocop-shopify (2.17.1) + rubocop (~> 1.62) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + shoulda-context (3.0.0.rc1) + shoulda-matchers (6.5.0) + activesupport (>= 5.2.0) stringio (3.1.0) thor (1.3.0) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.1.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -168,11 +233,23 @@ PLATFORMS x86_64-linux DEPENDENCIES + annotate bootsnap debug + factory_bot_rails + faker + minitest-power_assert + mocha pg (~> 1.1) + pry-rails puma (~> 5.0) + rack-cors rails (~> 7.0.8) + rubocop + rubocop-rails + rubocop-shopify + shoulda-context (~> 3.0.0.rc1) + shoulda-matchers (~> 6.0) tzinfo-data RUBY VERSION diff --git a/serverside_challenge_2/challenge/api/README.md b/serverside_challenge_2/challenge/api/README.md new file mode 100644 index 000000000..7db80e4ca --- /dev/null +++ b/serverside_challenge_2/challenge/api/README.md @@ -0,0 +1,24 @@ +# README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... diff --git a/serverside_challenge_2/challenge/Rakefile b/serverside_challenge_2/challenge/api/Rakefile similarity index 100% rename from serverside_challenge_2/challenge/Rakefile rename to serverside_challenge_2/challenge/api/Rakefile diff --git a/serverside_challenge_2/challenge/app/channels/application_cable/channel.rb b/serverside_challenge_2/challenge/api/app/channels/application_cable/channel.rb similarity index 71% rename from serverside_challenge_2/challenge/app/channels/application_cable/channel.rb rename to serverside_challenge_2/challenge/api/app/channels/application_cable/channel.rb index d67269728..9aec23053 100644 --- a/serverside_challenge_2/challenge/app/channels/application_cable/channel.rb +++ b/serverside_challenge_2/challenge/api/app/channels/application_cable/channel.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ApplicationCable class Channel < ActionCable::Channel::Base end diff --git a/serverside_challenge_2/challenge/app/channels/application_cable/connection.rb b/serverside_challenge_2/challenge/api/app/channels/application_cable/connection.rb similarity index 73% rename from serverside_challenge_2/challenge/app/channels/application_cable/connection.rb rename to serverside_challenge_2/challenge/api/app/channels/application_cable/connection.rb index 0ff5442f4..8d6c2a1bf 100644 --- a/serverside_challenge_2/challenge/app/channels/application_cable/connection.rb +++ b/serverside_challenge_2/challenge/api/app/channels/application_cable/connection.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ApplicationCable class Connection < ActionCable::Connection::Base end diff --git a/serverside_challenge_2/challenge/api/app/controllers/api/v1/electricity_charges_controller.rb b/serverside_challenge_2/challenge/api/app/controllers/api/v1/electricity_charges_controller.rb new file mode 100644 index 000000000..b54a5a0ec --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/controllers/api/v1/electricity_charges_controller.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +class Api::V1::ElectricityChargesController < ApplicationController + def index + ampere = params[:ampere] + usage = params[:usage] + + if ampere.blank? || usage.blank? + return render( + json: { error: I18n.t('api.v1.electricity_charges.errors.missing_parameters') }, + status: :bad_request, + ) + end + + results = Plan.includes(:provider, :basic_charges, :usage_charges).filter_map do |plan| + price = ElectricityChargeCalculator.execute!(plan: plan, ampere: ampere, usage: usage) + next if price.nil? + + { provider_name: plan.provider.name, plan_name: plan.name, price: price } + end + + render(json: results, status: :ok) + rescue ElectricityChargeCalculator::InvalidInputError, + ElectricityChargeCalculator::InvalidUsageError, + ElectricityChargeCalculator::InvalidAmpereError => e + render(json: { error: e.message }, status: :bad_request) + rescue StandardError => e + error_message = I18n.t('api.v1.electricity_charges.errors.internal_server_error') + Rails.logger.error("#{error_message}: #{e.message}") + render(json: { error: error_message }, status: :internal_server_error) + end +end diff --git a/serverside_challenge_2/challenge/app/controllers/application_controller.rb b/serverside_challenge_2/challenge/api/app/controllers/application_controller.rb similarity index 64% rename from serverside_challenge_2/challenge/app/controllers/application_controller.rb rename to serverside_challenge_2/challenge/api/app/controllers/application_controller.rb index 4ac8823b0..13c271fb6 100644 --- a/serverside_challenge_2/challenge/app/controllers/application_controller.rb +++ b/serverside_challenge_2/challenge/api/app/controllers/application_controller.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + class ApplicationController < ActionController::API end diff --git a/serverside_challenge_2/challenge/app/controllers/concerns/.keep b/serverside_challenge_2/challenge/api/app/controllers/concerns/.keep similarity index 100% rename from serverside_challenge_2/challenge/app/controllers/concerns/.keep rename to serverside_challenge_2/challenge/api/app/controllers/concerns/.keep diff --git a/serverside_challenge_2/challenge/app/jobs/application_job.rb b/serverside_challenge_2/challenge/api/app/jobs/application_job.rb similarity index 89% rename from serverside_challenge_2/challenge/app/jobs/application_job.rb rename to serverside_challenge_2/challenge/api/app/jobs/application_job.rb index d394c3d10..bef395997 100644 --- a/serverside_challenge_2/challenge/app/jobs/application_job.rb +++ b/serverside_challenge_2/challenge/api/app/jobs/application_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationJob < ActiveJob::Base # Automatically retry jobs that encountered a deadlock # retry_on ActiveRecord::Deadlocked diff --git a/serverside_challenge_2/challenge/api/app/mailers/application_mailer.rb b/serverside_challenge_2/challenge/api/app/mailers/application_mailer.rb new file mode 100644 index 000000000..d84cb6e71 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/mailers/application_mailer.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/serverside_challenge_2/challenge/api/app/models/application_record.rb b/serverside_challenge_2/challenge/api/app/models/application_record.rb new file mode 100644 index 000000000..5a4cbb0a7 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/application_record.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class ApplicationRecord < ActiveRecord::Base + primary_abstract_class + + # https://github.com/rails/rails/blob/b180e2c522c372f5d028d6a5113e69ff416128ab/activemodel/lib/active_model/type/integer.rb#L100 + INTEGER_MAX = ActiveRecord::Type::Integer.new.__send__(:max_value) +end diff --git a/serverside_challenge_2/challenge/api/app/models/basic_charge.rb b/serverside_challenge_2/challenge/api/app/models/basic_charge.rb new file mode 100644 index 000000000..a21249bd1 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/basic_charge.rb @@ -0,0 +1,65 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: basic_charges +# +# id :bigint not null, primary key +# amount :decimal(8, 2) not null +# ampere :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_basic_charges_on_plan_id (plan_id) +# index_basic_charges_on_plan_id_and_ampere (plan_id,ampere) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +class BasicCharge < ApplicationRecord + include CsvImportable + MAX_AMOUNT = 999_999.99 + + belongs_to :plan + + validates :ampere, + presence: true, + uniqueness: { scope: :plan_id }, + numericality: { + only_integer: true, + greater_than: 0, + less_than_or_equal_to: INTEGER_MAX, + } + validates :amount, + presence: true, + numericality: { + greater_than_or_equal_to: 0, + less_than_or_equal_to: MAX_AMOUNT, + } + + class << self + private + + def convert_attrs!(attrs) + @plan_code_ids ||= Plan.pluck(:code, :id).to_h + convert_code_to_id( + attrs, + code_key: 'plan_code', + id_key: 'plan_id', + target_mappings: @plan_code_ids, + ) + end + + def csv_attributes + %w[plan_code ampere amount] + end + + def csv_upsert_unique_keys + %w[plan_id ampere] + end + end +end diff --git a/serverside_challenge_2/challenge/app/models/concerns/.keep b/serverside_challenge_2/challenge/api/app/models/concerns/.keep similarity index 100% rename from serverside_challenge_2/challenge/app/models/concerns/.keep rename to serverside_challenge_2/challenge/api/app/models/concerns/.keep diff --git a/serverside_challenge_2/challenge/api/app/models/concerns/csv_importable.rb b/serverside_challenge_2/challenge/api/app/models/concerns/csv_importable.rb new file mode 100644 index 000000000..63b75e83f --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/concerns/csv_importable.rb @@ -0,0 +1,68 @@ +# frozen_string_literal: true + +require 'csv' +module CsvImportable + class FileNotFoundError < StandardError; end + class UniqueKeyMissingError < StandardError; end + + ENCODING = 'UTF-8' + + extend ActiveSupport::Concern + + class_methods do + # NOTE: 現時点ではレコード数が少ないため1件ずつsave!で十分と判断。 + # 大量データに対応する必要が出た場合は upsert_all などでのバルクインサートに置き換える。 + def import_from_csv!(file_path) + raise ArgumentError if file_path.blank? + raise FileNotFoundError unless File.exist?(file_path) + + transaction do + CSV.foreach(file_path, headers: true, encoding: ENCODING).with_index(2) do |row, line_number| + attrs = row.to_h.slice(*csv_attributes).compact + converted_attrs = convert_attrs!(attrs) + unique_keys = csv_upsert_unique_keys + unique_conditions = unique_keys.index_with { |key| converted_attrs[key] } + + if unique_conditions.values.any?(&:blank?) + raise UniqueKeyMissingError, "ユニークキー(#{unique_keys.join(", ")})が空です" + end + + record = find_or_initialize_by(unique_conditions) + record.assign_attributes(converted_attrs) + record.save! + rescue ActiveRecord::RecordInvalid => e + Rails.logger.error("[#{name}] 行数#{line_number}: #{e.record.errors.full_messages.join(", ")} (入力内容: #{row.to_h})") + raise + rescue UniqueKeyMissingError => e + Rails.logger.error("[#{name}] 行数#{line_number}: #{e.message} (入力内容: #{row.to_h})") + raise + end + end + end + + private + + def convert_attrs!(attrs) + attrs + end + + def convert_code_to_id(attrs, code_key:, id_key:, target_mappings:) + code = attrs.delete(code_key) + target_id = target_mappings[code] + + if target_id.blank? + raise CsvImportable::UniqueKeyMissingError, "#{code_key}: #{code} が存在しません" + end + + attrs.merge(id_key => target_id) + end + + def csv_attributes + raise NotImplementedError + end + + def csv_upsert_unique_keys + raise NotImplementedError + end + end +end diff --git a/serverside_challenge_2/challenge/api/app/models/plan.rb b/serverside_challenge_2/challenge/api/app/models/plan.rb new file mode 100644 index 000000000..80a952548 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/plan.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: plans +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# provider_id :bigint not null +# +# Indexes +# +# index_plans_on_provider_id (provider_id) +# index_plans_on_provider_id_and_code (provider_id,code) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (provider_id => providers.id) +# +class Plan < ApplicationRecord + include CsvImportable + belongs_to :provider + has_many :basic_charges, dependent: :destroy + has_many :usage_charges, dependent: :destroy + + validates :name, presence: true + validates :code, presence: true, uniqueness: { scope: :provider_id } + + class << self + private + + def convert_attrs!(attrs) + @provider_code_ids ||= Provider.pluck(:code, :id).to_h + convert_code_to_id( + attrs, + code_key: 'provider_code', + id_key: 'provider_id', + target_mappings: @provider_code_ids, + ) + end + + def csv_attributes + %w[provider_code name code] + end + + def csv_upsert_unique_keys + %w[provider_id code] + end + end +end diff --git a/serverside_challenge_2/challenge/api/app/models/provider.rb b/serverside_challenge_2/challenge/api/app/models/provider.rb new file mode 100644 index 000000000..c3a10dc39 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/provider.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: providers +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_providers_on_code (code) UNIQUE +# +class Provider < ApplicationRecord + include CsvImportable + + has_many :plans, dependent: :destroy + + validates :name, presence: true + validates :code, presence: true, uniqueness: true + + class << self + private + + def csv_attributes + %w[code name] + end + + def csv_upsert_unique_keys + %w[code] + end + end +end diff --git a/serverside_challenge_2/challenge/api/app/models/usage_charge.rb b/serverside_challenge_2/challenge/api/app/models/usage_charge.rb new file mode 100644 index 000000000..3fab7e220 --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/models/usage_charge.rb @@ -0,0 +1,98 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: usage_charges +# +# id :bigint not null, primary key +# from_kwh :integer not null +# to_kwh :integer +# unit_price :decimal(8, 2) not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_usage_charges_on_plan_id (plan_id) +# index_usage_charges_on_plan_id_and_from_kwh (plan_id,from_kwh) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +class UsageCharge < ApplicationRecord + include CsvImportable + MAX_AMOUNT = 999_999.99 + belongs_to :plan + + validates :from_kwh, :unit_price, presence: true + validates :from_kwh, uniqueness: { scope: :plan_id } + validates :from_kwh, numericality: { + only_integer: true, + greater_than_or_equal_to: 0, + less_than_or_equal_to: INTEGER_MAX, + } + validates :to_kwh, numericality: { + only_integer: true, + allow_nil: true, + } + validates :unit_price, numericality: { + greater_than_or_equal_to: 0, + less_than_or_equal_to: MAX_AMOUNT, + } + validate :validate_to_kwh_greater_than_from_kwh + validate :validate_range_must_not_overlap + + scope :for_usage, ->(usage) { where('from_kwh <= ?', usage) } + + class << self + private + + def convert_attrs!(attrs) + @plan_code_ids ||= Plan.pluck(:code, :id).to_h + convert_code_to_id( + attrs, + code_key: 'plan_code', + id_key: 'plan_id', + target_mappings: @plan_code_ids, + ) + end + + def csv_attributes + %w[plan_code from_kwh to_kwh unit_price] + end + + def csv_upsert_unique_keys + %w[plan_id from_kwh] + end + end + + private + + def validate_to_kwh_greater_than_from_kwh + return if to_kwh.blank? || from_kwh.blank? + return if to_kwh > from_kwh + + errors.add(:to_kwh, "は#{self.class.human_attribute_name(:from_kwh)}より大きくなければなりません") + end + + def validate_range_must_not_overlap + return if from_kwh.blank? + return if plan.blank? + + errors.add(:base, '使用量範囲が他の区分と重複しています') if overlapping_range_exists? + end + + def overlapping_range_exists? + plan.usage_charges + .where.not(id: id) + .where( + '(from_kwh <= :to_kwh OR :to_kwh IS NULL) + AND (:from_kwh <= to_kwh OR to_kwh IS NULL)', + from_kwh: from_kwh, + to_kwh: to_kwh, + ) + .exists? + end +end diff --git a/serverside_challenge_2/challenge/api/app/services/electricity_charge_calculator.rb b/serverside_challenge_2/challenge/api/app/services/electricity_charge_calculator.rb new file mode 100644 index 000000000..9fb687b6d --- /dev/null +++ b/serverside_challenge_2/challenge/api/app/services/electricity_charge_calculator.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true + +class ElectricityChargeCalculator + class InvalidInputError < StandardError; end + class InvalidUsageError < StandardError; end + class InvalidAmpereError < StandardError; end + + INCLUSIVE_RANGE_OFFSET = 1 + TARGET_AMPERES = [10, 15, 20, 30, 40, 50, 60].freeze + + class << self + def execute!(plan:, ampere:, usage:) + raise ArgumentError, I18n.t('electricity_charge_calculator.errors.plan_required') if plan.nil? + + numeric_ampere = convert_to_numeric!(ampere) + numeric_usage = convert_to_numeric!(usage) + validate_input!(numeric_ampere, numeric_usage) + calculate_total_price(plan, numeric_ampere, numeric_usage) + end + + private + + def convert_to_numeric!(value) + Integer(value) + rescue ArgumentError, TypeError + raise InvalidInputError, I18n.t('electricity_charge_calculator.errors.invalid_input') + end + + def validate_input!(ampere, usage) + raise InvalidUsageError, I18n.t('electricity_charge_calculator.errors.invalid_usage') if usage.negative? + + if TARGET_AMPERES.exclude?(ampere) + raise InvalidAmpereError, + I18n.t( + 'electricity_charge_calculator.errors.invalid_ampere', + target_amperes: TARGET_AMPERES.map { |ampere| "#{ampere}A" }.join(', '), + ) + end + end + + def calculate_total_price(plan, ampere, usage) + basic_charge = plan.basic_charges.find_by(ampere: ampere) + return if basic_charge.nil? + + usage_amount = calculate_usage_amount(plan, usage) + return if usage_amount.nil? + + basic_amount = basic_charge.amount + (basic_amount + usage_amount).floor + end + + def calculate_usage_amount(plan, usage) + usage_charges = plan.usage_charges.for_usage(usage) + return if usage_charges.blank? + + usage_charges.sum do |usage_charge| + from_kwh = usage_charge.from_kwh + to_kwh = usage_charge.to_kwh || Float::INFINITY + usage_in_tier = [usage, to_kwh].min + chargeable_kwh = calculate_chargeable_kwh_in_tier(from_kwh, usage_in_tier) + + chargeable_kwh * usage_charge.unit_price + end + end + + def calculate_chargeable_kwh_in_tier(from_kwh, usage_in_tier) + from_kwh.zero? ? usage_in_tier : (usage_in_tier - from_kwh + INCLUSIVE_RANGE_OFFSET) + end + end +end diff --git a/serverside_challenge_2/challenge/app/views/layouts/mailer.html.erb b/serverside_challenge_2/challenge/api/app/views/layouts/mailer.html.erb similarity index 100% rename from serverside_challenge_2/challenge/app/views/layouts/mailer.html.erb rename to serverside_challenge_2/challenge/api/app/views/layouts/mailer.html.erb diff --git a/serverside_challenge_2/challenge/app/views/layouts/mailer.text.erb b/serverside_challenge_2/challenge/api/app/views/layouts/mailer.text.erb similarity index 100% rename from serverside_challenge_2/challenge/app/views/layouts/mailer.text.erb rename to serverside_challenge_2/challenge/api/app/views/layouts/mailer.text.erb diff --git a/serverside_challenge_2/challenge/bin/rails b/serverside_challenge_2/challenge/api/bin/rails similarity index 100% rename from serverside_challenge_2/challenge/bin/rails rename to serverside_challenge_2/challenge/api/bin/rails diff --git a/serverside_challenge_2/challenge/bin/rake b/serverside_challenge_2/challenge/api/bin/rake similarity index 100% rename from serverside_challenge_2/challenge/bin/rake rename to serverside_challenge_2/challenge/api/bin/rake diff --git a/serverside_challenge_2/challenge/bin/setup b/serverside_challenge_2/challenge/api/bin/setup similarity index 100% rename from serverside_challenge_2/challenge/bin/setup rename to serverside_challenge_2/challenge/api/bin/setup diff --git a/serverside_challenge_2/challenge/api/bin/start.sh b/serverside_challenge_2/challenge/api/bin/start.sh new file mode 100644 index 000000000..f94da5b72 --- /dev/null +++ b/serverside_challenge_2/challenge/api/bin/start.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +echo "本番環境をを起動します" + +bundle exec rails s -p ${PORT:-8080} -b "0.0.0.0" diff --git a/serverside_challenge_2/challenge/config.ru b/serverside_challenge_2/challenge/api/config.ru similarity index 100% rename from serverside_challenge_2/challenge/config.ru rename to serverside_challenge_2/challenge/api/config.ru diff --git a/serverside_challenge_2/challenge/config/application.rb b/serverside_challenge_2/challenge/api/config/application.rb similarity index 91% rename from serverside_challenge_2/challenge/config/application.rb rename to serverside_challenge_2/challenge/api/config/application.rb index b39913bf7..69a2aefc3 100644 --- a/serverside_challenge_2/challenge/config/application.rb +++ b/serverside_challenge_2/challenge/api/config/application.rb @@ -10,6 +10,8 @@ module App class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 + config.time_zone = ENV.fetch('TZ', 'Asia/Tokyo') + config.i18n.default_locale = :ja # Configuration for the application, engines, and railties goes here. # diff --git a/serverside_challenge_2/challenge/api/config/boot.rb b/serverside_challenge_2/challenge/api/config/boot.rb new file mode 100644 index 000000000..c04863fa7 --- /dev/null +++ b/serverside_challenge_2/challenge/api/config/boot.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/serverside_challenge_2/challenge/config/cable.yml b/serverside_challenge_2/challenge/api/config/cable.yml similarity index 100% rename from serverside_challenge_2/challenge/config/cable.yml rename to serverside_challenge_2/challenge/api/config/cable.yml diff --git a/serverside_challenge_2/challenge/config/credentials.yml.enc b/serverside_challenge_2/challenge/api/config/credentials.yml.enc similarity index 100% rename from serverside_challenge_2/challenge/config/credentials.yml.enc rename to serverside_challenge_2/challenge/api/config/credentials.yml.enc diff --git a/serverside_challenge_2/challenge/config/database.yml b/serverside_challenge_2/challenge/api/config/database.yml similarity index 93% rename from serverside_challenge_2/challenge/config/database.yml rename to serverside_challenge_2/challenge/api/config/database.yml index 9c66b2942..a0897040b 100644 --- a/serverside_challenge_2/challenge/config/database.yml +++ b/serverside_challenge_2/challenge/api/config/database.yml @@ -20,9 +20,9 @@ default: &default # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - host: db - username: postgres - password: password + host: <%= ENV.fetch('DATABASE_HOST') { 'db' } %> + username: <%= ENV.fetch("POSTGRES_USER") { 'postgres' } %> + password: <%= ENV.fetch("POSTGRES_PASSWORD") { 'password' } %> development: <<: *default @@ -84,4 +84,4 @@ test: # production: <<: *default - database: app_production + url: <%= ENV.fetch("POSTGRES_URL") %> diff --git a/serverside_challenge_2/challenge/config/environment.rb b/serverside_challenge_2/challenge/api/config/environment.rb similarity index 61% rename from serverside_challenge_2/challenge/config/environment.rb rename to serverside_challenge_2/challenge/api/config/environment.rb index cac531577..d5abe5580 100644 --- a/serverside_challenge_2/challenge/config/environment.rb +++ b/serverside_challenge_2/challenge/api/config/environment.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Load the Rails application. -require_relative "application" +require_relative 'application' # Initialize the Rails application. Rails.application.initialize! diff --git a/serverside_challenge_2/challenge/config/environments/development.rb b/serverside_challenge_2/challenge/api/config/environments/development.rb similarity index 100% rename from serverside_challenge_2/challenge/config/environments/development.rb rename to serverside_challenge_2/challenge/api/config/environments/development.rb diff --git a/serverside_challenge_2/challenge/config/environments/production.rb b/serverside_challenge_2/challenge/api/config/environments/production.rb similarity index 100% rename from serverside_challenge_2/challenge/config/environments/production.rb rename to serverside_challenge_2/challenge/api/config/environments/production.rb diff --git a/serverside_challenge_2/challenge/config/environments/test.rb b/serverside_challenge_2/challenge/api/config/environments/test.rb similarity index 100% rename from serverside_challenge_2/challenge/config/environments/test.rb rename to serverside_challenge_2/challenge/api/config/environments/test.rb diff --git a/serverside_challenge_2/challenge/config/initializers/cors.rb b/serverside_challenge_2/challenge/api/config/initializers/cors.rb similarity index 52% rename from serverside_challenge_2/challenge/config/initializers/cors.rb rename to serverside_challenge_2/challenge/api/config/initializers/cors.rb index e5a82f162..27194fe5d 100644 --- a/serverside_challenge_2/challenge/config/initializers/cors.rb +++ b/serverside_challenge_2/challenge/api/config/initializers/cors.rb @@ -5,12 +5,11 @@ # Read more: https://github.com/cyu/rack-cors -# Rails.application.config.middleware.insert_before 0, Rack::Cors do -# allow do -# origins "example.com" -# -# resource "*", -# headers: :any, -# methods: [:get, :post, :put, :patch, :delete, :options, :head] -# end -# end +Rails.application.config.middleware.insert_before 0, Rack::Cors do + allow do + origins ENV.fetch('ALLOWED_ORIGIN') + resource '/api/v1/electricity_charges', + headers: :any, + methods: [:get] + end +end diff --git a/serverside_challenge_2/challenge/config/initializers/filter_parameter_logging.rb b/serverside_challenge_2/challenge/api/config/initializers/filter_parameter_logging.rb similarity index 100% rename from serverside_challenge_2/challenge/config/initializers/filter_parameter_logging.rb rename to serverside_challenge_2/challenge/api/config/initializers/filter_parameter_logging.rb diff --git a/serverside_challenge_2/challenge/config/initializers/inflections.rb b/serverside_challenge_2/challenge/api/config/initializers/inflections.rb similarity index 100% rename from serverside_challenge_2/challenge/config/initializers/inflections.rb rename to serverside_challenge_2/challenge/api/config/initializers/inflections.rb diff --git a/serverside_challenge_2/challenge/config/locales/en.yml b/serverside_challenge_2/challenge/api/config/locales/en.yml similarity index 100% rename from serverside_challenge_2/challenge/config/locales/en.yml rename to serverside_challenge_2/challenge/api/config/locales/en.yml diff --git a/serverside_challenge_2/challenge/api/config/locales/ja.yml b/serverside_challenge_2/challenge/api/config/locales/ja.yml new file mode 100644 index 000000000..f94785ab5 --- /dev/null +++ b/serverside_challenge_2/challenge/api/config/locales/ja.yml @@ -0,0 +1,32 @@ +# NOTE: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/ja.yml +ja: + api: + v1: + electricity_charges: + errors: + missing_parameters: 契約アンペア数(A)と使用量(kWh)は必須です。 + internal_server_error: エラーが発生しました。 + electricity_charge_calculator: + errors: + plan_required: planは必須です + invalid_input: 契約アンペア数(A)と使用量(kWh)は数値で指定してください。 + invalid_usage: 使用量(kWh)は0以上を指定してください。 + invalid_ampere: 契約アンペア数(A)は%{target_amperes}のいずれかを指定してください。 + activerecord: + errors: + messages: + record_invalid: 'バリデーションに失敗しました: %{errors}' + restrict_dependent_destroy: + has_one: "%{record}が存在しているので削除できません" + has_many: "%{record}が存在しているので削除できません" + attributes: + provider: + code: コード + name: 名前 + usage_charge: + from_kwh: 使用量(kwh)の下限 + to_kwh: 使用量(kwh)の上限 + unit_price: 単価 + errors: + format: "%{attribute}%{message}" + diff --git a/serverside_challenge_2/challenge/config/puma.rb b/serverside_challenge_2/challenge/api/config/puma.rb similarity index 79% rename from serverside_challenge_2/challenge/config/puma.rb rename to serverside_challenge_2/challenge/api/config/puma.rb index daaf03699..bb2151d45 100644 --- a/serverside_challenge_2/challenge/config/puma.rb +++ b/serverside_challenge_2/challenge/api/config/puma.rb @@ -1,28 +1,30 @@ +# frozen_string_literal: true + # Puma can serve each request in a thread from an internal thread pool. # The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match # the maximum value specified for Puma. Default is set to 5 threads for minimum # and maximum; this matches the default thread size of Active Record. # -max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } -min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 } +min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count } threads min_threads_count, max_threads_count # Specifies the `worker_timeout` threshold that Puma will use to wait before # terminating a worker in development environments. # -worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development" +worker_timeout 3600 if ENV.fetch('RAILS_ENV', 'development') == 'development' # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch("PORT") { 3000 } +port ENV.fetch('PORT') { 3000 } # Specifies the `environment` that Puma will run in. # -environment ENV.fetch("RAILS_ENV") { "development" } +environment ENV.fetch('RAILS_ENV') { 'development' } # Specifies the `pidfile` that Puma will use. -pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } +pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' } # Specifies the number of `workers` to boot in clustered mode. # Workers are forked web server processes. If using threads and workers together diff --git a/serverside_challenge_2/challenge/api/config/routes.rb b/serverside_challenge_2/challenge/api/config/routes.rb new file mode 100644 index 000000000..eda8d8647 --- /dev/null +++ b/serverside_challenge_2/challenge/api/config/routes.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +Rails.application.routes.draw do + namespace :api do + namespace :v1 do + resources :electricity_charges, only: [:index] + end + end +end diff --git a/serverside_challenge_2/challenge/config/storage.yml b/serverside_challenge_2/challenge/api/config/storage.yml similarity index 100% rename from serverside_challenge_2/challenge/config/storage.yml rename to serverside_challenge_2/challenge/api/config/storage.yml diff --git a/serverside_challenge_2/challenge/api/db/csv/basic_charges.csv b/serverside_challenge_2/challenge/api/db/csv/basic_charges.csv new file mode 100644 index 000000000..0ba2cbfa4 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/csv/basic_charges.csv @@ -0,0 +1,26 @@ +plan_code,ampere,amount +juuryouB,10,286.00 +juuryouB,15,429.00 +juuryouB,20,572.00 +juuryouB,30,858.00 +juuryouB,40,1144.00 +juuryouB,50,1430.00 +juuryouB,60,1716.00 +standardS,10,311.75 +standardS,15,467.63 +standardS,20,623.50 +standardS,30,935.25 +standardS,40,1247.00 +standardS,50,1558.75 +standardS,60,1870.50 +zuttomo1,30,858.00 +zuttomo1,40,1144.00 +zuttomo1,50,1430.00 +zuttomo1,60,1716.00 +ouchiplan,10,0.00 +ouchiplan,15,0.00 +ouchiplan,20,0.00 +ouchiplan,30,0.00 +ouchiplan,40,0.00 +ouchiplan,50,0.00 +ouchiplan,60,0.00 diff --git a/serverside_challenge_2/challenge/api/db/csv/plans.csv b/serverside_challenge_2/challenge/api/db/csv/plans.csv new file mode 100644 index 000000000..b6c1dd007 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/csv/plans.csv @@ -0,0 +1,5 @@ +provider_code,name,code +tepco,従量電灯B,juuryouB +tepco,スタンダードS,standardS +tokyo-gas,ずっとも電気1,zuttomo1 +looop-denki,おうちプラン,ouchiplan diff --git a/serverside_challenge_2/challenge/api/db/csv/providers.csv b/serverside_challenge_2/challenge/api/db/csv/providers.csv new file mode 100644 index 000000000..4f4d4e068 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/csv/providers.csv @@ -0,0 +1,4 @@ +code,name +tepco,東京電力エナジーパートナー +tokyo-gas,東京ガス +looop-denki,Looopでんき diff --git a/serverside_challenge_2/challenge/api/db/csv/usage_charges.csv b/serverside_challenge_2/challenge/api/db/csv/usage_charges.csv new file mode 100644 index 000000000..59f98bf76 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/csv/usage_charges.csv @@ -0,0 +1,11 @@ +plan_code,from_kwh,to_kwh,unit_price +juuryouB,0,120,19.88 +juuryouB,121,300,26.48 +juuryouB,301,,30.57 +standardS,0,120,29.80 +standardS,121,300,36.40 +standardS,301,,40.49 +zuttomo1,0,140,23.67 +zuttomo1,141,350,23.88 +zuttomo1,351,,26.41 +ouchiplan,0,,28.8 diff --git a/serverside_challenge_2/challenge/api/db/migrate/20251018152428_create_providers.rb b/serverside_challenge_2/challenge/api/db/migrate/20251018152428_create_providers.rb new file mode 100644 index 000000000..846b8f373 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/migrate/20251018152428_create_providers.rb @@ -0,0 +1,11 @@ +class CreateProviders < ActiveRecord::Migration[7.0] + def change + create_table :providers do |t| + t.string :name, null: false + t.string :code, null: false + t.timestamps + end + + add_index :providers, :code, unique: true + end +end diff --git a/serverside_challenge_2/challenge/api/db/migrate/20251019014744_create_plans.rb b/serverside_challenge_2/challenge/api/db/migrate/20251019014744_create_plans.rb new file mode 100644 index 000000000..e7455394f --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/migrate/20251019014744_create_plans.rb @@ -0,0 +1,12 @@ +class CreatePlans < ActiveRecord::Migration[7.0] + def change + create_table :plans do |t| + t.references :provider, null: false, foreign_key: true + t.string :name, null: false + t.string :code, null: false + t.timestamps + end + + add_index :plans, [:provider_id, :code], unique: true + end +end diff --git a/serverside_challenge_2/challenge/api/db/migrate/20251019162140_create_basic_charges.rb b/serverside_challenge_2/challenge/api/db/migrate/20251019162140_create_basic_charges.rb new file mode 100644 index 000000000..9bf98fc4e --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/migrate/20251019162140_create_basic_charges.rb @@ -0,0 +1,12 @@ +class CreateBasicCharges < ActiveRecord::Migration[7.0] + def change + create_table :basic_charges do |t| + t.references :plan, null: false, foreign_key: true + t.integer :ampere, null: false + t.decimal :amount, null: false, precision: 8, scale: 2 + t.timestamps + end + + add_index :basic_charges, [:plan_id, :ampere], unique: true + end +end diff --git a/serverside_challenge_2/challenge/api/db/migrate/20251019172807_create_usage_charges.rb b/serverside_challenge_2/challenge/api/db/migrate/20251019172807_create_usage_charges.rb new file mode 100644 index 000000000..0b6cbb6ba --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/migrate/20251019172807_create_usage_charges.rb @@ -0,0 +1,13 @@ +class CreateUsageCharges < ActiveRecord::Migration[7.0] + def change + create_table :usage_charges do |t| + t.references :plan, null: false, foreign_key: true + t.integer :from_kwh, null: false + t.integer :to_kwh + t.decimal :unit_price, null: false, precision: 8, scale: 2 + t.timestamps + end + + add_index :usage_charges, [:plan_id, :from_kwh], unique: true + end +end diff --git a/serverside_challenge_2/challenge/api/db/schema.rb b/serverside_challenge_2/challenge/api/db/schema.rb new file mode 100644 index 000000000..3e3421f7a --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/schema.rb @@ -0,0 +1,59 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema[7.0].define(version: 2025_10_19_172807) do + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "basic_charges", force: :cascade do |t| + t.bigint "plan_id", null: false + t.integer "ampere", null: false + t.decimal "amount", precision: 8, scale: 2, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["plan_id", "ampere"], name: "index_basic_charges_on_plan_id_and_ampere", unique: true + t.index ["plan_id"], name: "index_basic_charges_on_plan_id" + end + + create_table "plans", force: :cascade do |t| + t.bigint "provider_id", null: false + t.string "name", null: false + t.string "code", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["provider_id", "code"], name: "index_plans_on_provider_id_and_code", unique: true + t.index ["provider_id"], name: "index_plans_on_provider_id" + end + + create_table "providers", force: :cascade do |t| + t.string "name", null: false + t.string "code", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["code"], name: "index_providers_on_code", unique: true + end + + create_table "usage_charges", force: :cascade do |t| + t.bigint "plan_id", null: false + t.integer "from_kwh", null: false + t.integer "to_kwh" + t.decimal "unit_price", precision: 8, scale: 2, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["plan_id", "from_kwh"], name: "index_usage_charges_on_plan_id_and_from_kwh", unique: true + t.index ["plan_id"], name: "index_usage_charges_on_plan_id" + end + + add_foreign_key "basic_charges", "plans" + add_foreign_key "plans", "providers" + add_foreign_key "usage_charges", "plans" +end diff --git a/serverside_challenge_2/challenge/api/db/seeds.rb b/serverside_challenge_2/challenge/api/db/seeds.rb new file mode 100644 index 000000000..89ea80208 --- /dev/null +++ b/serverside_challenge_2/challenge/api/db/seeds.rb @@ -0,0 +1,5 @@ +Provider.import_from_csv!(Rails.root.join('db/csv/providers.csv')) +Plan.import_from_csv!(Rails.root.join('db/csv/plans.csv')) +BasicCharge.import_from_csv!(Rails.root.join('db/csv/basic_charges.csv')) +UsageCharge.import_from_csv!(Rails.root.join('db/csv/usage_charges.csv')) +puts 'seed完了' diff --git a/serverside_challenge_2/challenge/api/dot.env b/serverside_challenge_2/challenge/api/dot.env new file mode 100644 index 000000000..5ad1489c3 --- /dev/null +++ b/serverside_challenge_2/challenge/api/dot.env @@ -0,0 +1,6 @@ +RAILS_ENV=development +DATABASE_HOST=db +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password +POSTGRES_URL= +ALLOWED_ORIGIN=http://localhost:3001 diff --git a/serverside_challenge_2/challenge/api/dot.test.env b/serverside_challenge_2/challenge/api/dot.test.env new file mode 100644 index 000000000..d90881743 --- /dev/null +++ b/serverside_challenge_2/challenge/api/dot.test.env @@ -0,0 +1,6 @@ +RAILS_ENV=test +DATABASE_HOST=test-db +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password +POSTGRES_URL= +ALLOWED_ORIGIN=http://localhost:3001 diff --git a/serverside_challenge_2/challenge/lib/tasks/.keep b/serverside_challenge_2/challenge/api/lib/tasks/.keep similarity index 100% rename from serverside_challenge_2/challenge/lib/tasks/.keep rename to serverside_challenge_2/challenge/api/lib/tasks/.keep diff --git a/serverside_challenge_2/challenge/api/lib/tasks/auto_annotate_models.rake b/serverside_challenge_2/challenge/api/lib/tasks/auto_annotate_models.rake new file mode 100644 index 000000000..e96283ea5 --- /dev/null +++ b/serverside_challenge_2/challenge/api/lib/tasks/auto_annotate_models.rake @@ -0,0 +1,59 @@ +# NOTE: only doing this in development as some production environments (Heroku) +# NOTE: are sensitive to local FS writes, and besides -- it's just not proper +# NOTE: to have a dev-mode tool do its thing in production. +if Rails.env.development? + require 'annotate' + task :set_annotation_options do + # You can override any of these by setting an environment variable of the + # same name. + Annotate.set_defaults( + 'active_admin' => 'false', + 'additional_file_patterns' => [], + 'routes' => 'false', + 'models' => 'true', + 'position_in_routes' => 'before', + 'position_in_class' => 'before', + 'position_in_test' => 'before', + 'position_in_fixture' => 'before', + 'position_in_factory' => 'before', + 'position_in_serializer' => 'before', + 'show_foreign_keys' => 'true', + 'show_complete_foreign_keys' => 'false', + 'show_indexes' => 'true', + 'simple_indexes' => 'false', + 'model_dir' => 'app/models', + 'root_dir' => '', + 'include_version' => 'false', + 'require' => '', + 'exclude_tests' => 'false', + 'exclude_fixtures' => 'false', + 'exclude_factories' => 'false', + 'exclude_serializers' => 'false', + 'exclude_scaffolds' => 'true', + 'exclude_controllers' => 'true', + 'exclude_helpers' => 'true', + 'exclude_sti_subclasses' => 'false', + 'ignore_model_sub_dir' => 'false', + 'ignore_columns' => nil, + 'ignore_routes' => nil, + 'ignore_unknown_models' => 'false', + 'hide_limit_column_types' => 'integer,bigint,boolean', + 'hide_default_column_types' => 'json,jsonb,hstore', + 'skip_on_db_migrate' => 'false', + 'format_bare' => 'true', + 'format_rdoc' => 'false', + 'format_yard' => 'false', + 'format_markdown' => 'false', + 'sort' => 'false', + 'force' => 'false', + 'frozen' => 'false', + 'classified_sort' => 'true', + 'trace' => 'false', + 'wrapper_open' => nil, + 'wrapper_close' => nil, + 'with_comment' => 'true' + ) + end + + Annotate.load_tasks +end diff --git a/serverside_challenge_2/challenge/log/.keep b/serverside_challenge_2/challenge/api/log/.keep similarity index 100% rename from serverside_challenge_2/challenge/log/.keep rename to serverside_challenge_2/challenge/api/log/.keep diff --git a/serverside_challenge_2/challenge/public/robots.txt b/serverside_challenge_2/challenge/api/public/robots.txt similarity index 100% rename from serverside_challenge_2/challenge/public/robots.txt rename to serverside_challenge_2/challenge/api/public/robots.txt diff --git a/serverside_challenge_2/challenge/storage/.keep b/serverside_challenge_2/challenge/api/storage/.keep similarity index 100% rename from serverside_challenge_2/challenge/storage/.keep rename to serverside_challenge_2/challenge/api/storage/.keep diff --git a/serverside_challenge_2/challenge/test/channels/application_cable/connection_test.rb b/serverside_challenge_2/challenge/api/test/channels/application_cable/connection_test.rb similarity index 81% rename from serverside_challenge_2/challenge/test/channels/application_cable/connection_test.rb rename to serverside_challenge_2/challenge/api/test/channels/application_cable/connection_test.rb index 800405f15..c2938056f 100644 --- a/serverside_challenge_2/challenge/test/channels/application_cable/connection_test.rb +++ b/serverside_challenge_2/challenge/api/test/channels/application_cable/connection_test.rb @@ -1,4 +1,6 @@ -require "test_helper" +# frozen_string_literal: true + +require 'test_helper' class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase # test "connects with cookies" do diff --git a/serverside_challenge_2/challenge/test/controllers/.keep b/serverside_challenge_2/challenge/api/test/controllers/.keep similarity index 100% rename from serverside_challenge_2/challenge/test/controllers/.keep rename to serverside_challenge_2/challenge/api/test/controllers/.keep diff --git a/serverside_challenge_2/challenge/api/test/controllers/api/v1/electricity_charges_controller_test.rb b/serverside_challenge_2/challenge/api/test/controllers/api/v1/electricity_charges_controller_test.rb new file mode 100644 index 000000000..f5c8279ee --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/controllers/api/v1/electricity_charges_controller_test.rb @@ -0,0 +1,130 @@ +# frozen_string_literal: true + +require 'test_helper' + +class Api::V1::ElectricityChargesControllerTest < ActionDispatch::IntegrationTest + setup do + @provider = create(:provider, name: 'テスト電気') + @plan = create(:plan, provider: @provider, name: 'テストプラン') + end + + def parse_response_body + JSON.parse(response.body) + end + + test '#indexは契約アンペア数と使用量を受け取り、プランの料金を返す' do + create(:basic_charge, plan: @plan) + create(:usage_charge, plan: @plan) + expected_price = 1000 + + ElectricityChargeCalculator.expects(:execute!).returns(expected_price) + + get api_v1_electricity_charges_path, params: { ampere: 10, usage: 100 } + + assert_response :success + response_body = parse_response_body + assert { response_body.length == 1 } + assert { response_body.first['price'] == expected_price } + assert { response_body.first['provider_name'] == @provider.name } + assert { response_body.first['plan_name'] == @plan.name } + end + + test '#indexは契約アンペア数と使用量を受け取り、複数のプランの料金を返す' do + plan1 = @plan + create(:basic_charge, plan: plan1) + create(:usage_charge, plan: plan1) + + provider2 = create(:provider, name: 'テスト電気2') + plan2 = create(:plan, provider: provider2, name: 'テストプラン2') + create(:basic_charge, plan: plan2) + create(:usage_charge, plan: plan2) + + expected_price1 = 1000 + expected_price2 = 2000 + ElectricityChargeCalculator.expects(:execute!) + .twice + .returns(expected_price1, expected_price2) + + get api_v1_electricity_charges_path, params: { ampere: 10, usage: 100 } + + assert_response :success + response_body = parse_response_body + + assert { response_body.length == 2 } + assert { response_body.first['price'] == expected_price1 } + assert { response_body.second['price'] == expected_price2 } + assert { response_body.first['provider_name'] == plan1.provider.name } + assert { response_body.first['plan_name'] == plan1.name } + assert { response_body.second['provider_name'] == plan2.provider.name } + assert { response_body.second['plan_name'] == plan2.name } + end + + test '#indexは契約アンペア数が空の場合に400を返す' do + get api_v1_electricity_charges_path, params: { ampere: nil, usage: 100 } + + assert_response :bad_request + assert { parse_response_body['error'] == '契約アンペア数(A)と使用量(kWh)は必須です。' } + end + + test '#indexは使用量が空の場合に400を返す' do + get api_v1_electricity_charges_path, params: { ampere: 10, usage: nil } + + assert_response :bad_request + assert { parse_response_body['error'] == '契約アンペア数(A)と使用量(kWh)は必須です。' } + end + + test '#indexは契約アンペア数と使用量が空の場合に400を返す' do + get api_v1_electricity_charges_path, params: { ampere: nil, usage: nil } + + assert_response :bad_request + assert { parse_response_body['error'] == '契約アンペア数(A)と使用量(kWh)は必須です。' } + end + + test '#indexは契約アンペア数が無効な場合に400を返す' do + create(:basic_charge, plan: @plan) + create(:usage_charge, plan: @plan) + + get api_v1_electricity_charges_path, params: { ampere: 'invalid', usage: 100 } + + assert_response :bad_request + assert { parse_response_body['error'] == '契約アンペア数(A)と使用量(kWh)は数値で指定してください。' } + end + + test '#indexは使用量が無効な場合に400を返す' do + create(:basic_charge, plan: @plan) + create(:usage_charge, plan: @plan) + + get api_v1_electricity_charges_path, params: { ampere: 10, usage: 'invalid' } + + assert_response :bad_request + assert { parse_response_body['error'] == '契約アンペア数(A)と使用量(kWh)は数値で指定してください。' } + end + + test '#indexは従量料金区分が登録されていない場合に空配列を返す' do + create(:basic_charge, plan: @plan) + + get api_v1_electricity_charges_path, params: { ampere: 10, usage: 100 } + + assert_response :success + assert { parse_response_body == [] } + end + + test '#indexは指定されたアンペア数の基本料金が存在しない場合に空配列を返す' do + create(:usage_charge, plan: @plan) + ampere = 10 + + get api_v1_electricity_charges_path, params: { ampere: ampere, usage: 100 } + + assert_response :success + assert { parse_response_body == [] } + end + + test '#indexは想定外のエラーが発生した場合に500を返す' do + ElectricityChargeCalculator.expects(:execute!).raises(StandardError) + + get api_v1_electricity_charges_path, params: { ampere: 10, usage: 100 } + + assert_response :internal_server_error + assert { parse_response_body['error'] == 'エラーが発生しました。' } + end +end diff --git a/serverside_challenge_2/challenge/api/test/factories/basic_charges.rb b/serverside_challenge_2/challenge/api/test/factories/basic_charges.rb new file mode 100644 index 000000000..cf9c9e00a --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/factories/basic_charges.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: basic_charges +# +# id :bigint not null, primary key +# amount :decimal(8, 2) not null +# ampere :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_basic_charges_on_plan_id (plan_id) +# index_basic_charges_on_plan_id_and_ampere (plan_id,ampere) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +FactoryBot.define do + factory :basic_charge do + plan { create(:plan) } + ampere { 10 } + amount { 1000.00 } + end +end diff --git a/serverside_challenge_2/challenge/api/test/factories/plans.rb b/serverside_challenge_2/challenge/api/test/factories/plans.rb new file mode 100644 index 000000000..6d310b392 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/factories/plans.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: plans +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# provider_id :bigint not null +# +# Indexes +# +# index_plans_on_provider_id (provider_id) +# index_plans_on_provider_id_and_code (provider_id,code) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (provider_id => providers.id) +# +FactoryBot.define do + factory :plan do + provider { create(:provider) } + name { Faker::Company.name } + sequence(:code) { |n| "code_#{n}" } + end +end diff --git a/serverside_challenge_2/challenge/api/test/factories/providers.rb b/serverside_challenge_2/challenge/api/test/factories/providers.rb new file mode 100644 index 000000000..ef618c100 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/factories/providers.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: providers +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_providers_on_code (code) UNIQUE +# +FactoryBot.define do + factory :provider do + name { Faker::Company.name } + sequence(:code) { |n| "code_#{n}" } + end +end diff --git a/serverside_challenge_2/challenge/api/test/factories/usage_charges.rb b/serverside_challenge_2/challenge/api/test/factories/usage_charges.rb new file mode 100644 index 000000000..2dc5ff1c7 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/factories/usage_charges.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: usage_charges +# +# id :bigint not null, primary key +# from_kwh :integer not null +# to_kwh :integer +# unit_price :decimal(8, 2) not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_usage_charges_on_plan_id (plan_id) +# index_usage_charges_on_plan_id_and_from_kwh (plan_id,from_kwh) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +FactoryBot.define do + factory :usage_charge do + plan { create(:plan) } + from_kwh { 0 } + to_kwh { 100 } + unit_price { 10.00 } + end +end diff --git a/serverside_challenge_2/challenge/test/fixtures/files/.keep b/serverside_challenge_2/challenge/api/test/fixtures/files/.keep similarity index 100% rename from serverside_challenge_2/challenge/test/fixtures/files/.keep rename to serverside_challenge_2/challenge/api/test/fixtures/files/.keep diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans.csv new file mode 100644 index 000000000..b6c1dd007 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans.csv @@ -0,0 +1,5 @@ +provider_code,name,code +tepco,従量電灯B,juuryouB +tepco,スタンダードS,standardS +tokyo-gas,ずっとも電気1,zuttomo1 +looop-denki,おうちプラン,ouchiplan diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans_invalid_provider.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans_invalid_provider.csv new file mode 100644 index 000000000..a50ea6215 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/plans_invalid_provider.csv @@ -0,0 +1,2 @@ +provider_code,name,code +"",従量電灯B,juuryouB diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers.csv new file mode 100644 index 000000000..4f4d4e068 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers.csv @@ -0,0 +1,4 @@ +code,name +tepco,東京電力エナジーパートナー +tokyo-gas,東京ガス +looop-denki,Looopでんき diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_header_only.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_header_only.csv new file mode 100644 index 000000000..54496af3d --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_header_only.csv @@ -0,0 +1 @@ +code,name diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_invalid.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_invalid.csv new file mode 100644 index 000000000..d3f04936e --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_invalid.csv @@ -0,0 +1,3 @@ +code,name +tepco,東京電力エナジーパートナー +tokyo-gas, diff --git a/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_unique_key_empty.csv b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_unique_key_empty.csv new file mode 100644 index 000000000..eefa6eca9 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/files/csv/providers_unique_key_empty.csv @@ -0,0 +1,2 @@ +code,name +,東京電力エナジーパートナー diff --git a/serverside_challenge_2/challenge/api/test/fixtures/usage_charges.yml b/serverside_challenge_2/challenge/api/test/fixtures/usage_charges.yml new file mode 100644 index 000000000..3283f0e43 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/fixtures/usage_charges.yml @@ -0,0 +1,31 @@ +# == Schema Information +# +# Table name: usage_charges +# +# id :bigint not null, primary key +# from_kwh :integer not null +# to_kwh :integer +# unit_price :decimal(8, 2) not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_usage_charges_on_plan_id (plan_id) +# index_usage_charges_on_plan_id_and_from_kwh (plan_id,from_kwh) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/serverside_challenge_2/challenge/test/integration/.keep b/serverside_challenge_2/challenge/api/test/integration/.keep similarity index 100% rename from serverside_challenge_2/challenge/test/integration/.keep rename to serverside_challenge_2/challenge/api/test/integration/.keep diff --git a/serverside_challenge_2/challenge/test/mailers/.keep b/serverside_challenge_2/challenge/api/test/mailers/.keep similarity index 100% rename from serverside_challenge_2/challenge/test/mailers/.keep rename to serverside_challenge_2/challenge/api/test/mailers/.keep diff --git a/serverside_challenge_2/challenge/test/models/.keep b/serverside_challenge_2/challenge/api/test/models/.keep similarity index 100% rename from serverside_challenge_2/challenge/test/models/.keep rename to serverside_challenge_2/challenge/api/test/models/.keep diff --git a/serverside_challenge_2/challenge/api/test/models/basic_charge_test.rb b/serverside_challenge_2/challenge/api/test/models/basic_charge_test.rb new file mode 100644 index 000000000..15a658573 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/models/basic_charge_test.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: basic_charges +# +# id :bigint not null, primary key +# amount :decimal(8, 2) not null +# ampere :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_basic_charges_on_plan_id (plan_id) +# index_basic_charges_on_plan_id_and_ampere (plan_id,ampere) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +require 'test_helper' + +class BasicChargeTest < ActiveSupport::TestCase + subject { build(:basic_charge) } + + should belong_to(:plan) + should validate_presence_of(:ampere) + should validate_uniqueness_of(:ampere).scoped_to(:plan_id) + should validate_numericality_of(:ampere) + .only_integer + .is_greater_than(0) + .is_less_than_or_equal_to(ApplicationRecord::INTEGER_MAX) + should validate_presence_of(:amount) + should validate_numericality_of(:amount) + .is_greater_than_or_equal_to(0) + .is_less_than_or_equal_to(BasicCharge::MAX_AMOUNT) +end diff --git a/serverside_challenge_2/challenge/api/test/models/csv_importable_test.rb b/serverside_challenge_2/challenge/api/test/models/csv_importable_test.rb new file mode 100644 index 000000000..09095cf9f --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/models/csv_importable_test.rb @@ -0,0 +1,128 @@ +# frozen_string_literal: true + +require 'test_helper' + +class CsvImportableTest < ActiveSupport::TestCase + setup do + @csv_file_path = Rails.root.join('test/fixtures/files/csv/providers.csv') + end + + test '.import_from_csv! はCSVファイルを読み込んでモデルにインポートする' do + assert_difference 'Provider.count', 3 do + Provider.import_from_csv!(@csv_file_path) + end + + providers = Provider.all + assert { providers.find { |provider| provider.code == 'tokyo-gas' }.name == '東京ガス' } + assert { providers.find { |provider| provider.code == 'looop-denki' }.name == 'Looopでんき' } + assert { providers.find { |provider| provider.code == 'tepco' }.name == '東京電力エナジーパートナー' } + end + + test '.import_from_csv! は同じCSVを複数回インポートしても重複しない' do + assert_difference 'Provider.count', 3 do + Provider.import_from_csv!(@csv_file_path) + end + assert_no_difference 'Provider.count' do + Provider.import_from_csv!(@csv_file_path) + end + end + + test '.import_from_csv! は既存のレコードを更新する' do + target_provider = create(:provider, code: 'tokyo-gas', name: 'hoge') + + Provider.import_from_csv!(@csv_file_path) + assert { target_provider.reload.name == '東京ガス' } + end + + test '.import_from_csv! はヘッダーのみのCSVの場合何もしない' do + assert_no_difference 'Provider.count' do + Provider.import_from_csv!(Rails.root.join('test/fixtures/files/csv/providers_header_only.csv')) + end + end + + test '.import_from_csv! はCSVファイルが空の場合例外を発生させる' do + assert_raises ArgumentError do + Provider.import_from_csv!(nil) + end + end + + test '.import_from_csv! はCSVファイルが存在しない場合例外を発生させる' do + assert_raises CsvImportable::FileNotFoundError do + Provider.import_from_csv!(Rails.root.join('test/fixtures/files/csv/providers_not_found.csv')) + end + end + + test '.import_from_csv! はcsv_attributesが未実装の場合例外を発生させる' do + klass = Class.new(ApplicationRecord) do + include CsvImportable + + class << self + private + + def csv_upsert_unique_key + 'code' + end + end + end + + assert_raises NotImplementedError do + klass.import_from_csv!(@csv_file_path) + end + end + + test '.import_from_csv! はcsv_upsert_unique_keyが未実装の場合例外を発生させる' do + klass = Class.new(ApplicationRecord) do + include CsvImportable + + class << self + private + + def csv_attributes + %w[code name] + end + end + end + + assert_raises NotImplementedError do + klass.import_from_csv!(@csv_file_path) + end + end + + test '.import_from_csv! はユニークキーが空の場合例外を発生させる' do + assert_raises CsvImportable::UniqueKeyMissingError do + Provider.import_from_csv!(Rails.root.join('test/fixtures/files/csv/providers_unique_key_empty.csv')) + end + end + + test '.import_from_csv! はバリデーションエラーが発生した場合例外を発生させる' do + assert_raises ActiveRecord::RecordInvalid do + Provider.import_from_csv!(Rails.root.join('test/fixtures/files/csv/providers_invalid.csv')) + end + end + + test '.import_from_csv! は途中でエラーが発生した場合ロールバックする' do + assert_raises ActiveRecord::RecordInvalid do + Provider.import_from_csv!(Rails.root.join('test/fixtures/files/csv/providers_invalid.csv')) + end + assert { Provider.count == 0 } + end + + test '.import_from_csv! はcodeからidへ変換してモデルにインポートする' do + Provider.import_from_csv!(@csv_file_path) + plan_csv_file_path = Rails.root.join('test/fixtures/files/csv/plans.csv') + + assert_difference 'Plan.count', 4 do + Plan.import_from_csv!(plan_csv_file_path) + end + + plan = Plan.find_by(code: 'juuryouB') + provider = Provider.find_by(code: 'tepco') + assert { plan.provider_id == provider.id } + end + + test '.import_from_csv! はcodeが存在しない場合例外を発生させる' do + assert_raises CsvImportable::UniqueKeyMissingError do + Plan.import_from_csv!(Rails.root.join('test/fixtures/files/csv/plans_invalid_provider.csv')) + end + end +end diff --git a/serverside_challenge_2/challenge/api/test/models/plan_test.rb b/serverside_challenge_2/challenge/api/test/models/plan_test.rb new file mode 100644 index 000000000..5a1fc24aa --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/models/plan_test.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: plans +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# provider_id :bigint not null +# +# Indexes +# +# index_plans_on_provider_id (provider_id) +# index_plans_on_provider_id_and_code (provider_id,code) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (provider_id => providers.id) +# +require 'test_helper' + +class PlanTest < ActiveSupport::TestCase + subject { build(:plan) } + + should belong_to(:provider) + should have_many(:basic_charges) + should have_many(:usage_charges) + + should validate_presence_of(:name) + should validate_presence_of(:code) + should validate_uniqueness_of(:code).scoped_to(:provider_id) +end diff --git a/serverside_challenge_2/challenge/api/test/models/provider_test.rb b/serverside_challenge_2/challenge/api/test/models/provider_test.rb new file mode 100644 index 000000000..e063425ae --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/models/provider_test.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: providers +# +# id :bigint not null, primary key +# code :string not null +# name :string not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_providers_on_code (code) UNIQUE +# +require 'test_helper' + +class ProviderTest < ActiveSupport::TestCase + subject { build(:provider) } + + should have_many(:plans) + should validate_presence_of(:name) + should validate_presence_of(:code) + should validate_uniqueness_of(:code) +end diff --git a/serverside_challenge_2/challenge/api/test/models/usage_charge_test.rb b/serverside_challenge_2/challenge/api/test/models/usage_charge_test.rb new file mode 100644 index 000000000..1c5cda804 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/models/usage_charge_test.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: usage_charges +# +# id :bigint not null, primary key +# from_kwh :integer not null +# to_kwh :integer +# unit_price :decimal(8, 2) not null +# created_at :datetime not null +# updated_at :datetime not null +# plan_id :bigint not null +# +# Indexes +# +# index_usage_charges_on_plan_id (plan_id) +# index_usage_charges_on_plan_id_and_from_kwh (plan_id,from_kwh) UNIQUE +# +# Foreign Keys +# +# fk_rails_... (plan_id => plans.id) +# +require 'test_helper' + +class UsageChargeTest < ActiveSupport::TestCase + setup do + @plan = create(:plan) + end + + subject { build(:usage_charge) } + should belong_to(:plan) + + should validate_presence_of(:from_kwh) + should validate_uniqueness_of(:from_kwh).scoped_to(:plan_id) + should validate_numericality_of(:from_kwh) + .only_integer + .is_greater_than_or_equal_to(0) + .is_less_than_or_equal_to(ApplicationRecord::INTEGER_MAX) + should validate_numericality_of(:to_kwh) + .only_integer + .allow_nil + should validate_presence_of(:unit_price) + should validate_numericality_of(:unit_price) + .is_greater_than_or_equal_to(0) + .is_less_than_or_equal_to(UsageCharge::MAX_AMOUNT) + + test 'from_kwhがto_kwhより小さい場合は有効' do + usage_charge = build(:usage_charge, plan: @plan, from_kwh: 101, to_kwh: 200) + + assert { usage_charge.valid? } + end + + test 'from_kwhがto_kwhより大きい場合は無効' do + usage_charge = build(:usage_charge, plan: @plan, from_kwh: 20, to_kwh: 10) + + assert { usage_charge.invalid? } + assert { usage_charge.errors.full_messages.include?('使用量(kwh)の上限は使用量(kwh)の下限より大きくなければなりません') } + end + + test '使用量範囲が他の使用量範囲と重複していない場合は有効' do + create(:usage_charge, plan: @plan, from_kwh: 10, to_kwh: 20) + usage_charge = build(:usage_charge, plan: @plan, from_kwh: 21, to_kwh: 30) + + assert { usage_charge.valid? } + end + + test '使用量範囲が他の使用量範囲と重複している場合は無効' do + create(:usage_charge, plan: @plan, from_kwh: 10, to_kwh: 20) + usage_charge = build(:usage_charge, plan: @plan, from_kwh: 20, to_kwh: 30) + + assert { usage_charge.invalid? } + assert { usage_charge.errors.full_messages.include?('使用量範囲が他の区分と重複しています') } + end + + test 'to_kwhがnilの場合でも重複チェックが正しく動作する' do + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: nil) + usage_charge = build(:usage_charge, plan: @plan, from_kwh: 1, to_kwh: nil) + + assert { usage_charge.invalid? } + assert { usage_charge.errors.full_messages.include?('使用量範囲が他の区分と重複しています') } + end + + test '別のプランの使用量範囲と重複している場合は有効' do + provider = create(:provider) + plan1 = create(:plan, provider: provider) + plan2 = create(:plan, provider: provider) + create(:usage_charge, plan: plan1, from_kwh: 0, to_kwh: nil) + usage_charge = build(:usage_charge, plan: plan2, from_kwh: 1, to_kwh: nil) + + assert { usage_charge.valid? } + end +end diff --git a/serverside_challenge_2/challenge/api/test/services/electricity_charge_calculator_test.rb b/serverside_challenge_2/challenge/api/test/services/electricity_charge_calculator_test.rb new file mode 100644 index 000000000..86bf05821 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/services/electricity_charge_calculator_test.rb @@ -0,0 +1,136 @@ +# frozen_string_literal: true + +require 'test_helper' + +class ElectricityChargeCalculatorTest < ActiveSupport::TestCase + def setup + @provider = create(:provider) + @plan = create(:plan, provider: @provider) + end + + test '.execute!は電気料金を計算する' do + create(:basic_charge, plan: @plan, ampere: 10, amount: 1000.00) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120, unit_price: 19.88) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 120) + assert { price == 3385 } + end + + test '.execute!は合計金額の小数点以下を切り捨てる' do + create(:basic_charge, plan: @plan, ampere: 10, amount: 1000.00) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120, unit_price: 19.88) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 120) + assert { price.is_a?(Integer) } + end + + test '.execute!は複数の従量料金区分を正しく計算する' do + # NOTE: 手計算しやすいように 東京電力エナジーパートナー 従量電灯Bプランの値を使用 + ampere = 60 + create(:basic_charge, plan: @plan, ampere: ampere, amount: 1716.00) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120, unit_price: 19.88) + create(:usage_charge, plan: @plan, from_kwh: 121, to_kwh: 300, unit_price: 26.48) + create(:usage_charge, plan: @plan, from_kwh: 301, to_kwh: nil, unit_price: 30.57) + + price1 = ElectricityChargeCalculator.execute!(plan: @plan, ampere: ampere, usage: 300) + assert { price1 == 8868 } + + price2 = ElectricityChargeCalculator.execute!(plan: @plan, ampere: ampere, usage: 301) + assert { price2 == 8898 } + end + + test '.execute!は上限なしの従量料金区分を正しく計算する' do + # NOTE: 手計算しやすいように 東京電力エナジーパートナー 従量電灯Bプランの値を使用 + ampere = 60 + create(:basic_charge, plan: @plan, ampere: ampere, amount: 1716.00) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120, unit_price: 19.88) + create(:usage_charge, plan: @plan, from_kwh: 121, to_kwh: 300, unit_price: 26.48) + create(:usage_charge, plan: @plan, from_kwh: 301, to_kwh: nil, unit_price: 30.57) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: ampere, usage: 5000) + assert { price == 152547 } + end + + test '.execute!は使用量0の場合に基本料金のみを返す' do + basic_amount = 1000.00 + create(:basic_charge, plan: @plan, ampere: 10, amount: basic_amount) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 0) + assert { price == basic_amount } + end + + test '.execute!は基本料金が存在しない場合にnilを返す' do + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 120) + assert { price.nil? } + end + + test '.execute!はplanが指定されていない場合にエラーを返す' do + assert_raises ArgumentError do + ElectricityChargeCalculator.execute!(plan: nil, ampere: 10, usage: 120) + end + end + + test '.execute!は使用量に対する従量料金区分が存在しない場合にnilを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + + price = ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 120) + assert { price.nil? } + end + + test '.execute!は契約アンペア数が指定されていない場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidInputError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: nil, usage: 120) + end + end + + test '.execute!は使用量が指定されていない場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidInputError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: nil) + end + end + + test '.execute!は使用量が負の数値の場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidUsageError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: -1) + end + end + + test '.execute!は契約アンペア数が存在しない場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidAmpereError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: 11, usage: 120) + end + end + + test '.execute!は契約アンペア数が数値に変換できない文字列の場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidInputError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: 'hoge', usage: 120) + end + end + + test '.execute!は使用量が数値に変換できない文字列の場合にエラーを返す' do + create(:basic_charge, plan: @plan, ampere: 10) + create(:usage_charge, plan: @plan, from_kwh: 0, to_kwh: 120) + + assert_raises ElectricityChargeCalculator::InvalidInputError do + ElectricityChargeCalculator.execute!(plan: @plan, ampere: 10, usage: 'hoge') + end + end +end diff --git a/serverside_challenge_2/challenge/api/test/test_helper.rb b/serverside_challenge_2/challenge/api/test/test_helper.rb new file mode 100644 index 000000000..816e06fa6 --- /dev/null +++ b/serverside_challenge_2/challenge/api/test/test_helper.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require 'shoulda/context' +require 'mocha/minitest' + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + parallelize(workers: :number_of_processors) + include FactoryBot::Syntax::Methods + + Shoulda::Matchers.configure do |config| + config.integrate do |with| + with.test_framework(:minitest) + with.library(:rails) + end + end +end diff --git a/serverside_challenge_2/challenge/tmp/.keep b/serverside_challenge_2/challenge/api/tmp/.keep similarity index 100% rename from serverside_challenge_2/challenge/tmp/.keep rename to serverside_challenge_2/challenge/api/tmp/.keep diff --git a/serverside_challenge_2/challenge/tmp/pids/.keep b/serverside_challenge_2/challenge/api/tmp/pids/.keep similarity index 100% rename from serverside_challenge_2/challenge/tmp/pids/.keep rename to serverside_challenge_2/challenge/api/tmp/pids/.keep diff --git a/serverside_challenge_2/challenge/tmp/storage/.keep b/serverside_challenge_2/challenge/api/tmp/storage/.keep similarity index 100% rename from serverside_challenge_2/challenge/tmp/storage/.keep rename to serverside_challenge_2/challenge/api/tmp/storage/.keep diff --git a/serverside_challenge_2/challenge/vendor/.keep b/serverside_challenge_2/challenge/api/vendor/.keep similarity index 100% rename from serverside_challenge_2/challenge/vendor/.keep rename to serverside_challenge_2/challenge/api/vendor/.keep diff --git a/serverside_challenge_2/challenge/app/mailers/application_mailer.rb b/serverside_challenge_2/challenge/app/mailers/application_mailer.rb deleted file mode 100644 index 3c34c8148..000000000 --- a/serverside_challenge_2/challenge/app/mailers/application_mailer.rb +++ /dev/null @@ -1,4 +0,0 @@ -class ApplicationMailer < ActionMailer::Base - default from: "from@example.com" - layout "mailer" -end diff --git a/serverside_challenge_2/challenge/app/models/application_record.rb b/serverside_challenge_2/challenge/app/models/application_record.rb deleted file mode 100644 index b63caeb8a..000000000 --- a/serverside_challenge_2/challenge/app/models/application_record.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationRecord < ActiveRecord::Base - primary_abstract_class -end diff --git a/serverside_challenge_2/challenge/compose.test.yml b/serverside_challenge_2/challenge/compose.test.yml new file mode 100644 index 000000000..277a96999 --- /dev/null +++ b/serverside_challenge_2/challenge/compose.test.yml @@ -0,0 +1,23 @@ +services: + test-db: + image: postgres:18 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + volumes: + - postgres_volume:/var/lib/postgresql/18/docker + test-api: + build: + context: ./api + dockerfile: Dockerfile + command: tail -f /dev/null + env_file: + - ./api/.env.test + volumes: + - ./api:/app + tty: true + stdin_open: true + depends_on: + - test-db +volumes: + postgres_volume: diff --git a/serverside_challenge_2/challenge/compose.yml b/serverside_challenge_2/challenge/compose.yml new file mode 100644 index 000000000..09dc6e95f --- /dev/null +++ b/serverside_challenge_2/challenge/compose.yml @@ -0,0 +1,43 @@ +services: + db: + image: postgres:18 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + volumes: + - postgres_volume:/var/lib/postgresql/18/docker + restart: always + + front: + build: + context: ./front + dockerfile: Dockerfile + command: npm run dev + env_file: + - ./front/.env + volumes: + - ./front:/app + ports: + - "3001:3000" + restart: always + tty: true + stdin_open: true + + api: + build: + context: ./api + dockerfile: Dockerfile + command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'" + env_file: + - ./api/.env + volumes: + - ./api:/app + ports: + - "3000:3000" + restart: always + tty: true + stdin_open: true + depends_on: + - db +volumes: + postgres_volume: diff --git a/serverside_challenge_2/challenge/config/boot.rb b/serverside_challenge_2/challenge/config/boot.rb deleted file mode 100644 index 988a5ddc4..000000000 --- a/serverside_challenge_2/challenge/config/boot.rb +++ /dev/null @@ -1,4 +0,0 @@ -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) - -require "bundler/setup" # Set up gems listed in the Gemfile. -require "bootsnap/setup" # Speed up boot time by caching expensive operations. diff --git a/serverside_challenge_2/challenge/config/routes.rb b/serverside_challenge_2/challenge/config/routes.rb deleted file mode 100644 index 262ffd547..000000000 --- a/serverside_challenge_2/challenge/config/routes.rb +++ /dev/null @@ -1,6 +0,0 @@ -Rails.application.routes.draw do - # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html - - # Defines the root path route ("/") - # root "articles#index" -end diff --git a/serverside_challenge_2/challenge/db/seeds.rb b/serverside_challenge_2/challenge/db/seeds.rb deleted file mode 100644 index bc25fce30..000000000 --- a/serverside_challenge_2/challenge/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }]) -# Character.create(name: "Luke", movie: movies.first) diff --git a/serverside_challenge_2/challenge/docker-compose.yml b/serverside_challenge_2/challenge/docker-compose.yml deleted file mode 100644 index 723d14368..000000000 --- a/serverside_challenge_2/challenge/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3' -services: - db: - image: postgres - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - volumes: - - postgres_volume:/var/lib/postgresql/data - restart: always - web: - build: . - command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'" - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - volumes: - - .:/app - ports: - - "3000:3000" - restart: always - tty: true - stdin_open: true - depends_on: - - db -volumes: - postgres_volume: \ No newline at end of file diff --git a/serverside_challenge_2/challenge/front/.gitignore b/serverside_challenge_2/challenge/front/.gitignore new file mode 100644 index 000000000..5ef6a5207 --- /dev/null +++ b/serverside_challenge_2/challenge/front/.gitignore @@ -0,0 +1,41 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# env files (can opt-in for committing if needed) +.env* + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/serverside_challenge_2/challenge/front/Dockerfile b/serverside_challenge_2/challenge/front/Dockerfile new file mode 100644 index 000000000..ddfa1b093 --- /dev/null +++ b/serverside_challenge_2/challenge/front/Dockerfile @@ -0,0 +1,5 @@ +FROM node:22-bookworm +WORKDIR /app + +COPY package*.json ./ +RUN npm install diff --git a/serverside_challenge_2/challenge/front/README.md b/serverside_challenge_2/challenge/front/README.md new file mode 100644 index 000000000..e215bc4cc --- /dev/null +++ b/serverside_challenge_2/challenge/front/README.md @@ -0,0 +1,36 @@ +This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app). + +## Getting Started + +First, run the development server: + +```bash +npm run dev +# or +yarn dev +# or +pnpm dev +# or +bun dev +``` + +Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. + +You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. + +This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel. + +## Learn More + +To learn more about Next.js, take a look at the following resources: + +- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. +- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. + +You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome! + +## Deploy on Vercel + +The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. + +Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details. diff --git a/serverside_challenge_2/challenge/front/app/favicon.ico b/serverside_challenge_2/challenge/front/app/favicon.ico new file mode 100644 index 000000000..718d6fea4 Binary files /dev/null and b/serverside_challenge_2/challenge/front/app/favicon.ico differ diff --git a/serverside_challenge_2/challenge/front/app/globals.css b/serverside_challenge_2/challenge/front/app/globals.css new file mode 100644 index 000000000..a2dc41ece --- /dev/null +++ b/serverside_challenge_2/challenge/front/app/globals.css @@ -0,0 +1,26 @@ +@import "tailwindcss"; + +:root { + --background: #ffffff; + --foreground: #171717; +} + +@theme inline { + --color-background: var(--background); + --color-foreground: var(--foreground); + --font-sans: var(--font-geist-sans); + --font-mono: var(--font-geist-mono); +} + +@media (prefers-color-scheme: dark) { + :root { + --background: #0a0a0a; + --foreground: #ededed; + } +} + +body { + background: var(--background); + color: var(--foreground); + font-family: Arial, Helvetica, sans-serif; +} diff --git a/serverside_challenge_2/challenge/front/app/layout.tsx b/serverside_challenge_2/challenge/front/app/layout.tsx new file mode 100644 index 000000000..de15a3d55 --- /dev/null +++ b/serverside_challenge_2/challenge/front/app/layout.tsx @@ -0,0 +1,34 @@ +import type { Metadata } from "next"; +import { Geist, Geist_Mono } from "next/font/google"; +import "./globals.css"; + +const geistSans = Geist({ + variable: "--font-geist-sans", + subsets: ["latin"], +}); + +const geistMono = Geist_Mono({ + variable: "--font-geist-mono", + subsets: ["latin"], +}); + +export const metadata: Metadata = { + title: "電気料金計算ツール", + description: "電気料金を計算するツール", +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + + {children} + + + ); +} diff --git a/serverside_challenge_2/challenge/front/app/page.tsx b/serverside_challenge_2/challenge/front/app/page.tsx new file mode 100644 index 000000000..a8db89591 --- /dev/null +++ b/serverside_challenge_2/challenge/front/app/page.tsx @@ -0,0 +1,76 @@ +"use client"; + +import { useState } from "react"; +import { fetchElectricityCharges } from "@/lib/api/electricity"; +import { ElectricityPlanResult } from "@/types/electricity"; +import { ElectricityForm } from "@/components/ElectricityForm"; +import { ResultCard } from "@/components/ResultCard"; + +export default function Home() { + const [results, setResults] = useState
+ 結果はここに表示されます。 +
+ )} ++ {result.provider_name} +
++ {result.plan_name} +
++ {result.price.toLocaleString()}円 +
+