some logic / arch fixes

Author: HadronCollider

app/main/checks/report_checks/sw_section_banned_words.py

@@ -48,7 +48,9 @@ def check_text(text, banned_words):
         feedback = ""
         for chapter in chapters:
             if chapter['name'] in self.sections:
-                feedback += check_text(chapter['text'], self.sections[chapter['name']])
+                found_banned_words = check_text(chapter['text'], self.sections[chapter['name']])
+                if found_banned_words:
+                    feedback += f"<br>Раздел '{chapter['name']}' содержит запрещенные слова {found_banned_words}"
 
                 # check subchapters text too
                 if chapter['node'].get('children'):

app/main/checks/report_checks/sw_section_lit_reference.py

@@ -52,7 +52,7 @@ def check(self):
                     self.search_references(chapter['text'])[0])
                 subchapter_result = []
 
-                if chapter['node']['children']:
+                if chapter['node'].get('children'):
                     for subchapter in chapter['node']['children']:
                         subchapter_references = len(
                             self.search_references(subchapter['text'])[0])

app/main/reports/md_uploader/md_uploader.py

@@ -58,6 +58,9 @@ def __init__(self, filepath):
         self.headers_main = ''
         self.html_text = ''
         self.headers_page = 1
+        self.str_chapters = None
+        self.tree_chapters = None
+
 
     def upload(self):
         with open(self.filepath, "r", encoding="utf-8") as f:
@@ -149,16 +152,19 @@ def make_chapters(self, work_type):
         return self.chapters   
 
     def chapters_to_str(self):
+        if self.str_chapters: return self.str_chapters
         result = []
         for chapter in self.chapters:
             result.append({
                 "style": chapter['style'],
                 "name": re.sub(r"<[\/\w]*>", "", chapter['text']),
                 "text": "".join(re.sub(r"<[\/\w]*>", "", child['text']) for child in chapter['child'])
             })
+        self.str_chapters = result
         return result
 
     def build_chapter_tree(self, chapters):
+        if self.tree_chapters: return self.tree_chapters
         tree = []
         stack = [tree]
 
@@ -180,6 +186,7 @@ def build_chapter_tree(self, chapters):
 
             chapter['node'] = new_chapter
 
+        self.tree_chapters = tree
         return tree
 
     def get_tables_size(self):

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - "${WEB_PORT:-8080}:8080"
     depends_on:
       - mongodb
-      - worker
+      - redis
     env_file:
       - .env
     environment: