From f09da0e3fc31a0b1c8270520a85fb19c9890e258 Mon Sep 17 00:00:00 2001
From: pingpingy1 <pingpingy@kaist.ac.kr>
Date: Mon, 27 Nov 2023 14:12:49 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20=EB=8B=A4=EC=96=91=EC=84=B1=20=EC=A7=80?=
 =?UTF-8?q?=EC=88=98=20=EA=B3=84=EC=82=B0=20=ED=95=A8=EC=88=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 analysis/diversity_db.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/analysis/diversity_db.py b/analysis/diversity_db.py
index 165c0f7..fd8fe01 100644
--- a/analysis/diversity_db.py
+++ b/analysis/diversity_db.py
@@ -94,11 +94,12 @@ def calculate_rank_local(factor: str) -> None:
 
 
 def calculate_age_diversity_rank_history_local() -> None:
-    for councilor_type in ["elected", "candidate"]:
+    for is_elected in [True, False]:
         for localId in range(1, 227):
             docs = client["stats"]["age_hist"].find(
                 {
-                    "councilorType": councilor_type,
+                    "councilorType": "local_councilor",
+                    "is_elected": is_elected,
                     "method": "equal",
                     "level": 2,
                     "localId": localId,
@@ -115,7 +116,8 @@ def calculate_age_diversity_rank_history_local() -> None:
                 )
                 client["stats"]["age_hist"].find_one_and_update(
                     {
-                        "councilorType": councilor_type,
+                        "councilorType": "local_councilor",
+                        "is_elected": is_elected,
                         "method": "equal",
                         "level": 2,
                         "localId": localId,
@@ -131,7 +133,8 @@ def calculate_age_diversity_rank_history_local() -> None:
                 [
                     {
                         "$match": {
-                            "councilorType": councilor_type,
+                            "councilorType": "local_councilor",
+                            "is_elected": is_elected,
                             "method": "equal",
                             "level": 2,
                             "year": year,
@@ -147,7 +150,8 @@ def calculate_age_diversity_rank_history_local() -> None:
             for doc in result:
                 client["stats"]["age_hist"].find_one_and_update(
                     {
-                        "councilorType": councilor_type,
+                        "councilorType": "local_councilor",
+                        "is_elected": is_elected,
                         "method": "equal",
                         "level": 2,
                         "localId": doc["localId"],
@@ -196,13 +200,14 @@ def calculate_rank_metro(factor: str) -> None:
 
 
 def calculate_age_diversity_rank_history_metro() -> None:
-    for councilor_type in ["elected", "candidate"]:
+    for is_elected in [True, False]:
         for metroId in range(1, 18):
             docs = client["stats"]["age_hist"].find(
                 {
-                    "councilorType": councilor_type,
+                    "councilorType": "metro_councilor",
                     "method": "equal",
                     "level": 1,
+                    "is_elected": is_elected,
                     "metroId": metroId,
                 }
             )
@@ -217,9 +222,10 @@ def calculate_age_diversity_rank_history_metro() -> None:
                 )
                 client["stats"]["age_hist"].find_one_and_update(
                     {
-                        "councilorType": councilor_type,
+                        "councilorType": "metro_councilor",
                         "method": "equal",
                         "level": 1,
+                        "is_elected": is_elected,
                         "metroId": metroId,
                         "year": doc["year"],
                     },
@@ -233,9 +239,10 @@ def calculate_age_diversity_rank_history_metro() -> None:
                 [
                     {
                         "$match": {
-                            "councilorType": councilor_type,
+                            "councilorType": "metro_councilor",
                             "method": "equal",
                             "level": 1,
+                            "is_elected": is_elected,
                             "year": year,
                         }
                     },
@@ -249,9 +256,10 @@ def calculate_age_diversity_rank_history_metro() -> None:
             for doc in result:
                 client["stats"]["age_hist"].find_one_and_update(
                     {
-                        "councilorType": councilor_type,
+                        "councilorType": "metro_councilor",
                         "method": "equal",
                         "level": 1,
+                        "is_elected": is_elected,
                         "metroId": doc["metroId"],
                         "year": year,
                     },
@@ -267,7 +275,7 @@ def calculate_age_diversity_rank_history_metro() -> None:
     # calculate_rank_local("age")
     # calculate_rank_local("gender")
     # calculate_rank_local("party")
-    calculate_age_diversity_rank_history_local()
+    # calculate_age_diversity_rank_history_local()
 
     # for metroId in range(1, 18):
     #     if metroId in [8, 17]:
@@ -278,4 +286,4 @@ def calculate_age_diversity_rank_history_metro() -> None:
     # calculate_rank_metro("age")
     # calculate_rank_metro("gender")
     # calculate_rank_metro("party")
-    # calculate_age_diversity_rank_history_metro()
+    calculate_age_diversity_rank_history_metro()