Merge branch 'master' into feature/user_remove_temp

apps/core/management/scripts/portal_crawler.py

@@ -111,6 +111,9 @@ def _get_new_url_and_save_to_s3(url, session):
         hash = enc.hexdigest()[:20]
         filename = f'files/portal_image_{hash}.{url.split("_")[-1]}'
 
+        if url.startswith("/board"):
+            url = str(BASE_URL) + url
+
         r = session.get(url, stream=True, cookies=COOKIES)
         if r.status_code == 200:
             s3 = boto3.client("s3")
@@ -122,12 +125,10 @@ def _save_portal_image(html, session):
         soup = bs(html, "lxml")
         for child in soup.find_all("img", {}):
             old_url = child.attrs.get("src")
-            try:
-                new_url = _get_new_url_and_save_to_s3(old_url, session)
-                child["src"] = new_url
-            except Exception as exc:
-                log.info(child)
-                raise exec
+            if old_url is None:
+                continue
+            new_url = _get_new_url_and_save_to_s3(old_url, session)
+            child["src"] = new_url
 
         return str(soup)
 

apps/core/migrations/0057_alter_article_name_type_and_more.py

@@ -20,11 +20,4 @@ class Migration(migrations.Migration):
                 verbose_name="익명 혹은 실명 여부",
             ),
         ),
-        migrations.AddIndex(
-            model_name="article",
-            index=models.Index(
-                fields=["created_at", "parent_board_id"],
-                name="created_at_parent_board_id_idx",
-            ),
-        ),
     ]

apps/core/models/article.py

@@ -172,13 +172,6 @@ class Meta(MetaDataModel.Meta):
         verbose_name = "게시물"
         verbose_name_plural = "게시물 목록"
 
-        indexes = [
-            models.Index(
-                fields=["created_at", "parent_board_id"],
-                name="created_at_parent_board_id_idx",
-            )
-        ]
-
     def __str__(self):
         return self.title