Merge dev to tst

django/azure_services/adapters.py

@@ -298,4 +298,4 @@ def get_access_token(self):
             return None
 
     def is_auto_signup_allowed(self, request, sociallogin):
-        return True
+        return True

django/kpi/management/commands/update_solutionlog.py

@@ -0,0 +1,27 @@
+from django.core.management.base import BaseCommand
+from kpi.models import SolutionLog
+
+
+class Command(BaseCommand):
+    help = 'Updates solution log data for May and June 2023'
+
+    def handle(self, *args, **options):
+        all_entries = SolutionLog.objects.all()
+
+        for entry in all_entries:
+            data = entry.data
+            solutions = data['solutions']
+
+            for solution in solutions:
+                if 'problem_statements' in solution:
+                    if isinstance(solution['problem_statements'][0], dict):
+                        solution['problem_statements'] = [x['id'] for x in solution['problem_statements']]
+                    solution['problem_statements'] = list(set(solution['problem_statements']))
+
+                if 'portfolios' in solution:
+                    if isinstance(solution['portfolios'][0], dict):
+                        solution['portfolios'] = [x['id'] for x in solution['portfolios']]
+                    solution['portfolios'] = list(set(solution['portfolios']))
+
+            entry.data = data
+            entry.save()

django/kpi/tasks.py

@@ -25,6 +25,21 @@ def update_solution_log_task(current_date=None):
     portfolios = PortfolioKPISerializer(Portfolio.objects.all(), many=True)
     solutions = SolutionKPISerializer(Solution.objects.all(), many=True)
 
+    #making sure that solutions['data']['problem_statements'] and solutions['data']['portfolios'] 
+    #are both lists containing unique ids instead of the whole object
+    for solution in solutions.data:
+        if "problem_statements" in solution:
+            #checking if the item is a dictionary
+            if isinstance(solution["problem_statements"][0], dict):
+                solution["problem_statements"] = [x["id"] for x in solution["problem_statements"]]
+            #keeping unique ids only
+            solution["problem_statements"] = list(set(solution["problem_statements"]))
+
+        if "portfolios" in solution:
+            if isinstance(solution["portfolios"][0], dict):
+                solution["portfolios"] = [x["id"] for x in solution["portfolios"]]
+            solution["portfolios"] = list(set(solution["portfolios"]))
+
     log_entry.data = dict(portfolios=portfolios.data, solutions=solutions.data)
     log_entry.save()
 

django/project/models.py

@@ -1252,4 +1252,4 @@ class Meta:
         ]
 
     def __str__(self):  # pragma: no cover
-        return f"{self.solution} in {self.country}"
+        return f"{self.solution} in {self.country}"

django/startup_actions.sh

@@ -10,4 +10,5 @@ django-admin makemessages -l pt
 python manage.py compilemessages
 python manage.py migrate
 python manage.py migrate_sectors # TODO: Remove when the sectors are split in production.
+python manage.py update_solutionlog # TODO: Remove when the solution logs for may and june of 2023 are corrected. 
 gunicorn tiip.wsgi:application -w 2 -b :8000 --reload --timeout 120