From e6f2528a0e56b47a7e909f9949e47e8060ca3ec4 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Mon, 13 Nov 2017 21:02:12 +0100
Subject: [PATCH] Moved configuration to settings

---
 src/kasu/settings.py            | 28 ++++++++++++++++++++++++++++
 src/mahjong_ranking/__init__.py | 28 ++--------------------------
 src/mahjong_ranking/models.py   |  6 +++---
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/kasu/settings.py b/src/kasu/settings.py
index 3ffc8f3..a7a9009 100644
--- a/src/kasu/settings.py
+++ b/src/kasu/settings.py
@@ -246,6 +246,34 @@ LOGGING = {
     }
 }
 
+DAN_RANKS = (
+    (80, 9),
+    (70, 8),
+    (60, 7),
+    (50, 6),
+    (40, 5),
+    (30, 4),
+    (20, 3),
+    (10, 2),
+    (0, 1),
+)
+
+KYU_RANKS = (
+    (45, 1),
+    (40, 2),
+    (35, 3),
+    (30, 4),
+    (25, 5),
+    (20, 6),
+    (15, 7),
+    (10, 8),
+    (5, 9),
+    (0, 10),
+)
+
+DAN_ALLOW_DROP_DOWN = True
+MIN_HANCHANS_FOR_LADDER = 5
+
 try:
     from .local_settings import *  # Ignore PyLintBear (W0401, W0614)
 except ImportError:
diff --git a/src/mahjong_ranking/__init__.py b/src/mahjong_ranking/__init__.py
index 90c98ca..d048523 100644
--- a/src/mahjong_ranking/__init__.py
+++ b/src/mahjong_ranking/__init__.py
@@ -1,33 +1,9 @@
 # -*- encoding: utf-8 -*-
 from django.core.cache import cache
+from django.conf import settings
 import logging
-KYU_RANKS = (
-    (45, 1),
-    (40, 2),
-    (35, 3),
-    (30, 4),
-    (25, 5),
-    (20, 6),
-    (15, 7),
-    (10, 8),
-    (5, 9),
-    (0, 10),
-)
 
-DAN_RANKS = (
-    (80, 9),
-    (70, 8),
-    (60, 7),
-    (50, 6),
-    (40, 5),
-    (30, 4),
-    (20, 3),
-    (10, 2),
-    (0, 1),
-)
-
-DAN_RANKS_DICT = dict([(dan, points) for points, dan in DAN_RANKS])
-MIN_HANCHANS_FOR_LADDER = 5
+DAN_RANKS_DICT = dict([(dan, points) for points, dan in settings.DAN_RANKS])
 
 LOGGER = logging.getLogger('kasu.mahjong_ranking')
 
diff --git a/src/mahjong_ranking/models.py b/src/mahjong_ranking/models.py
index c1f3afe..191a727 100644
--- a/src/mahjong_ranking/models.py
+++ b/src/mahjong_ranking/models.py
@@ -13,7 +13,7 @@ from django.utils import timezone
 from django.utils.translation import ugettext as _
 
 from events.models import Event
-from . import KYU_RANKS, DAN_RANKS, DAN_RANKS_DICT, LOGGER, set_dirty
+from . import DAN_RANKS_DICT, LOGGER, set_dirty
 from . import managers
 
 kyu_dan_rankings = set()
@@ -555,7 +555,7 @@ class KyuDanRanking(models.Model):
             self.dan = 1
         elif self.dan or self.dan_points > 0:
             old_dan = self.dan
-            for min_points, dan_rank in DAN_RANKS:
+            for min_points, dan_rank in settings.DAN_RANKS:
                 if self.dan_points > min_points:
                     self.dan = dan_rank
                     break
@@ -570,7 +570,7 @@ class KyuDanRanking(models.Model):
             self.dan_points = 0
             self.kyu_points = 0
         else:
-            for min_points, kyu_rank in KYU_RANKS:
+            for min_points, kyu_rank in settings.KYU_RANKS:
                 if self.kyu_points > min_points:
                     self.kyu = kyu_rank
                     break