Merge branch 'release/3.16.0'

app/controllers/api_controller.rb

@@ -50,4 +50,49 @@ def updateDbToggle
     end
   end
 
+  # /api/menu_domitory/medi/use_db
+  def updateDbMediToggle
+    result = Sw.toggleUseDbMenu(Sw::MEDI)
+    render json: { success: true, result: result }
+  end
+
+  # /api/menu_domitoryhu/use_db
+  def updateDbHuToggle
+    result = Sw.toggleUseDbMenu(Sw::HU)
+    render json: { success: true, result: result }
+  end
+
+  # /api/menu_domitory/jungdam/use_db
+  def updateDbJungdamToggle
+    result = Sw.toggleUseDbMenu(Sw::JUNGDAM)
+    render json: { success: true, result: result }
+  end
+
+  # /api/menu_domitory/jinsu/use_db
+  def updateDbJinsuToggle
+    result = Sw.toggleUseDbMenu(Sw::JINSU)
+    render json: { success: true, result: result }
+  end
+
+  # /api/menu_domitory/student_hall/use_db
+  def updateDbStudentHallToggle
+    result = Sw.toggleUseDbMenu(Sw::STUDENT_HALL)
+    render json: { success: true, result: result }
+  end
+
+  # /api/menu_domitory/use_db
+  def getUseDb
+    result = Sw.get()
+    render json: {
+      success: true,
+      result: {
+        medi: result.use_db_medi,
+        hu: result.use_db_hu,
+        jungdam: result.use_db_jungdam,
+        jinsu: result.use_db_jinsu,
+        student_hall: result.use_db_student_hall
+      } 
+    }
+  end
+
 end

app/models/sw.rb

@@ -1,2 +1,104 @@
 class Sw < ActiveRecord::Base
+  MEDI = 'MEDI'
+  HU = 'HU'
+  JUNGDAM = 'JUNGDAM'
+  JINSU = 'JINSU'
+  STUDENT_HALL = 'STUDENT_HALL'
+
+  def self.get()
+    begin
+      @sw = Sw.find(1)
+    rescue
+      @sw = Sw.create
+    end
+    return @sw
+  end
+
+  def self.toggleUseDbMenu(type)
+    begin
+      @sw = Sw.find(1)
+    rescue
+      @sw = Sw.create
+    end
+    case type
+      when MEDI
+        @nextValue = !@sw.use_db_medi
+        @sw.use_db_medi = @nextValue
+      when HU
+        @nextValue = !@sw.use_db_hu
+        @sw.use_db_hu = @nextValue
+      when JUNGDAM
+        @nextValue = !@sw.use_db_jungdam
+        @sw.use_db_jungdam = @nextValue
+      when JINSU
+        @nextValue = !@sw.use_db_jinsu
+        @sw.use_db_jinsu = @nextValue
+      when STUDENT_HALL
+        @nextValue = !@sw.use_db_student_hall
+        @sw.use_db_student_hall = @nextValue
+    end
+    @sw.save
+    return @nextValue
+  end
+
+  def self.useDbMenu?(type)    
+    case type
+      when MEDI
+        return useMediDbMenu?
+      when HU
+        return useHuDbMenu?
+      when JUNGDAM
+        return useJungdamDbMenu?
+      when JINSU
+        return useJinsuDbMenu?
+      when STUDENT_HALL
+        return useStudentHallDbMenu?
+    end
+  end
+
+  def self.useMediDbMenu?
+    begin
+      useDbMenu = Sw.find(1).use_db_medi
+    rescue
+      useDbMenu = Sw.create.use_db_medi
+    end
+    return useDbMenu
+  end
+
+  def self.useHuDbMenu?
+    begin
+      useDbMenu = Sw.find(1).use_db_hu
+    rescue
+      useDbMenu = Sw.create.use_db_hu
+    end
+    return useDbMenu
+  end
+
+  def self.useJungdamDbMenu?
+    begin
+      useDbMenu = Sw.find(1).use_db_jungdam
+    rescue
+      useDbMenu = Sw.create.use_db_jungdam
+    end
+    return useDbMenu
+  end
+
+  def self.useJinsuDbMenu?
+    begin
+      useDbMenu = Sw.find(1).use_db_jinsu
+    rescue
+      useDbMenu = Sw.create.use_db_jinsu
+    end
+    return useDbMenu
+  end
+
+  def self.useStudentHallDbMenu?
+    begin
+      useDbMenu = Sw.find(1).use_db_student_hall
+    rescue
+      useDbMenu = Sw.create.use_db_student_hall
+    end
+    return useDbMenu
+  end
+
 end

app/modules/MenuStore.rb

@@ -5,18 +5,9 @@ class MenuStore
   def initialize
     @parser = JBNUFoodParser.new
   end
-
-  def useDbMenu?
-    begin
-      useDbMenu = Sw.find(1).use_db_menu
-    rescue
-      useDbMenu = Sw.create.use_db_menu
-    end
-    return useDbMenu
-  end
-
+
   def getJinsuMenus
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::JINSU)
       menus = ManagementApi.getJinsuMenu()
     else
       menus = @parser.requestMenu(0)
@@ -25,7 +16,7 @@ def getJinsuMenus
   end
 
   def getJinsuMenusOfDay(day)
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::JINSU)
       menus = ManagementApi.getJinsuMenuOfDay(day-1)
     else
       menus = @parser.requestMenu_jinsu_mobile(day)
@@ -34,7 +25,7 @@ def getJinsuMenusOfDay(day)
   end
 
   def getMediMenus
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::MEDI)
       menus = ManagementApi.getMediMenu()
     else
       menus = @parser.requestMenu(1)
@@ -43,7 +34,7 @@ def getMediMenus
   end
 
   def getMediMenusOfDay(day)
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::MEDI)
       menus = ManagementApi.getMediMenuOfDay(day-1)
     else
       menus = @parser.requestMenu_medi_mobile(day)
@@ -52,7 +43,7 @@ def getMediMenusOfDay(day)
   end
 
   def getStudentHallMenus
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::STUDENT_HALL)
       menus = ManagementApi.getStudentHallMenu()
     else
       menus = @parser.requestMenu(2)
@@ -61,7 +52,7 @@ def getStudentHallMenus
   end
 
   def getStudentHallMenusOfDay(day)
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::STUDENT_HALL)
       menus = ManagementApi.getStudentHallMenuOfDay(day-1)
     else
       menus = @parser.requestMenu_studentHall_mobile(day)
@@ -70,7 +61,7 @@ def getStudentHallMenusOfDay(day)
   end
 
   def getJungdamMenus
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::JUNGDAM)
       menus = ManagementApi.getJungdamMenu()
     else
       menus = @parser.requesJungdam()
@@ -79,7 +70,7 @@ def getJungdamMenus
   end
 
   def getJungdamMenusOfDay(day)
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::JUNGDAM)
       menus = ManagementApi.getJungdamMenuOfDay(day-1)
     else
       menus = @parser.requestMenu_jungdam_mobile(day)
@@ -88,7 +79,7 @@ def getJungdamMenusOfDay(day)
   end
 
   def getHuMenus
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::HU)
       menus = ManagementApi.getHuMenu()
     else
       menus = @parser.requestMenu_hu()
@@ -97,7 +88,7 @@ def getHuMenus
   end
 
   def getHuMenusOfDay(day)
-    if self.useDbMenu?
+    if Sw.useDbMenu?(Sw::HU)
       menus = ManagementApi.getHuMenuOfDay(day-1)
     else
       menus = @parser.requestMenu_hu_mobile(day)

config/routes.rb

@@ -14,6 +14,14 @@
   get '/api/menu_domitory/update' => 'api#updateAllDomitoryMenu'
   get '/api/menu_domitory/update/yesterday' => 'api#updateYesterdayToggle'
   get '/api/menu_domitory/update/use_db' => 'api#updateDbToggle'
+
+  get '/api/menu_domitory/use_db' => 'api#getUseDb'
+  put '/api/menu_domitory/medi/use_db' => 'api#updateDbMediToggle'
+  put '/api/menu_domitory/hu/use_db' => 'api#updateDbHuToggle'
+  put '/api/menu_domitory/jungdam/use_db' => 'api#updateDbJungdamToggle'
+  put '/api/menu_domitory/jinsu/use_db' => 'api#updateDbJinsuToggle'
+  put '/api/menu_domitory/student_hall/use_db' => 'api#updateDbStudentHallToggle'
+
 
   #major
   post '/major' => 'major#create'

db/migrate/20170430124356_create_sws.rb

@@ -6,6 +6,12 @@ def change
       t.boolean :use_db_menu, :default => true
       t.boolean :use_yesterday_domitory_menu, :default => false
 
+      t.boolean :use_db_medi, :default => true
+      t.boolean :use_db_hu, :default => true
+      t.boolean :use_db_jungdam, :default => true
+      t.boolean :use_db_jinsu, :default => true
+      t.boolean :use_db_student_hall, :default => true
+
       t.timestamps null: false
     end
   end

db/schema.rb

@@ -42,6 +42,11 @@
     t.boolean  "use_mobile_menu",             default: true
     t.boolean  "use_db_menu",                 default: true
     t.boolean  "use_yesterday_domitory_menu", default: false
+    t.boolean  "use_db_medi",                 default: true
+    t.boolean  "use_db_hu",                   default: true
+    t.boolean  "use_db_jungdam",              default: true
+    t.boolean  "use_db_jinsu",                default: true
+    t.boolean  "use_db_student_hall",         default: true
     t.datetime "created_at",                                  null: false
     t.datetime "updated_at",                                  null: false
   end