gomicorp
diff --git a/‎.dockerignore‎
Lines changed: 4 additions & 1 deletion b/‎.dockerignore‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 4 additions & 0 deletions b/‎.gitignore‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 30 additions & 0 deletions b/‎Dockerfile‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎Gemfile‎
Lines changed: 1 addition & 1 deletion b/‎Gemfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/controllers/api_controller.rb‎
Lines changed: 1 addition & 5 deletions b/‎app/controllers/api_controller.rb‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎app/mailers/partner/membership_mailer.rb‎
Lines changed: 1 addition & 1 deletion b/‎app/mailers/partner/membership_mailer.rb‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/models/cart.rb‎
Lines changed: 1 addition & 1 deletion b/‎app/models/cart.rb‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/models/notification.rb‎
Lines changed: 2 additions & 0 deletions b/‎app/models/notification.rb‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎app/models/receiver.rb‎
Lines changed: 3 additions & 0 deletions b/‎app/models/receiver.rb‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎app/models/shipping_address.rb‎
Lines changed: 4 additions & 0 deletions b/‎app/models/shipping_address.rb‎
Lines changed: 4 additions & 0 deletions
@@ -1,8 +1,11 @@
 # envs
 .env
 
-# master.key
+# credential keys
 /config/master.key
+/config/credentials/development.key
+/config/credentials/test.key
+/config/credentials/staging.key
 
 # Ignore related Docker
 docker/.docker_password.txt
 
@@ -22,6 +22,9 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+/config/credentials/development.key
+/config/credentials/test.key
+/config/credentials/staging.key
 
 /public/packs
 /public/packs-test
@@ -44,6 +47,7 @@ ignore/*
 db/backups
 db/backups/*
 db/schema.rb
+db/data_schema.rb
 
 .DS_Store
 **/*/.DS_Store
 
@@ -0,0 +1,30 @@
+#### 스테이징용 이미지 빌드 ####
+# 추후 staging service 이미지로 배포 가능
+FROM gomicorp/rails-with_passenger:6.0.3 as staging
+
+WORKDIR /app
+
+#소스코드 복사
+RUN git clone https://github.com/gomicorp/EcommerceAPI.git -b develop /app \
+    && git checkout develop && git clean -fd && git reset --hard
+
+# gem 설치 및 logrotate 설치
+RUN rm -rf Gemfile.lock && bundle config set without 'development test' && bundle install && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \
+    && yarn install && yarn cache clean \
+    && rm -rf /app/tmp && mkdir /app/tmp && touch /app/tmp/.keep && chmod o+w /app/tmp
+
+
+#### 프로덕션용 이미지 빌드 ####
+# 추후 production service 이미지로 배포 가능
+FROM gomicorp/rails-with_passenger:6.0.3 as production
+
+WORKDIR /app
+
+#소스코드 복사
+RUN git clone https://github.com/gomicorp/EcommerceAPI.git -b master /app \
+    && git checkout master && git clean -fd && git reset --hard
+
+# gem 설치 및 logrotate 설치
+RUN rm -rf Gemfile.lock && bundle config set without 'development test' && bundle install && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem \
+    && yarn install && yarn cache clean \
+    && rm -rf /app/tmp && mkdir /app/tmp && touch /app/tmp/.keep && chmod o+w /app/tmp
@@ -47,7 +47,7 @@ gem 'simple_trans', git: 'https://github.com/yhk1038/simple_trans.git'
 gem 'paper_trail'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.1'
+gem 'rails', '6.0.3'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.4.4'
 # Use Puma as the app server
 
@@ -4,7 +4,7 @@ class ApiController < ActionController::API
   private
 
   def set_raven_context
-    return unless production?
+    return unless %w[production staging].include?(Rails.env)
 
     # Raven.user_context(id: session[:current_user_id]) # or anything else in session
     Raven.extra_context(
@@ -14,10 +14,6 @@ def set_raven_context
     )
   end
 
-  def production?
-    Rails.env == 'production'
-  end
-
   def set_country_code
     @nation = params[:nation]
     ApplicationRecord.country_code = @nation
 
@@ -2,7 +2,7 @@ module Partner
   class MembershipMailer < ApplicationMailer
     layout false
 
-    HOST = Rails.env == 'production' ? 'https://partner.gomicorp.com' : 'http://localhost:3000'
+    HOST = %w[production staging].include?(Rails.env) ? 'https://partner.gomicorp.com' : 'http://localhost:3000'
 
     def create(membership, membership_param)
       @membership = membership
 
@@ -41,7 +41,7 @@ def final_result_price
 end
 
 
-class Cart < ApplicationRecord
+class Cart < NationRecord
   # 신규(desk) 입금대기(pay) 결제완료(paid) 배송준비(ship_ready) 배송중(ship_ing) 취소요청(cancel-request) 반품요청(refund-request) 환불실패 보관함(complete)
 
   # 요청 -> 접수(처리중) -> { 반려 -> 요청 -> ... } -> 완료
 
@@ -0,0 +1,2 @@
+class Notification < NationRecord
+end
@@ -0,0 +1,3 @@
+class Receiver < ApplicationRecord
+  belongs_to :user
+end
@@ -0,0 +1,4 @@
+class ShippingAddress < ApplicationRecord
+  has_many :user_addresses, class_name: 'UserShippingAddress', dependent: :destroy
+  has_many :users, through: :user_addresses
+end
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Notification < NationRecord`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class Receiver < ApplicationRecord`
	`2`	`+ belongs_to :user`
	`3`	`+end`