From 9fb5a59f800b70f79a9ea30a2f0f932871d9fd4a Mon Sep 17 00:00:00 2001 From: Shruti1229 Date: Thu, 28 Dec 2023 14:13:12 +0530 Subject: [PATCH] Move utillity function --- backend/organization/utils.py | 22 +++++++++++++++++++++- backend/organization/views.py | 9 --------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/backend/organization/utils.py b/backend/organization/utils.py index 0332a2f7..a4ff7b71 100644 --- a/backend/organization/utils.py +++ b/backend/organization/utils.py @@ -21,7 +21,6 @@ from project.views import ProjectViewSet from django.http import HttpRequest import pandas as pd -from project.utils import send_mail_with_report from transcript.models import Transcript from translation.models import Translation from voiceover.models import VoiceOver @@ -29,6 +28,21 @@ from task.models import Task +def send_mail_with_report(subject, body, user, csv_file_path): + from_email = settings.DEFAULT_FROM_EMAIL + to_email = user.email + email = EmailMessage(subject, body, from_email, [to_email]) + # Attach the CSV file to the email + email.attach_file(csv_file_path) + + # Send the email + try: + email.send() + except: + logging.info("Unable to send Email.") + os.remove(csv_file_path) + + def get_project_report_users(project_id, user): data = ProjectViewSet(detail=True) new_request = HttpRequest() @@ -36,6 +50,12 @@ def get_project_report_users(project_id, user): ret = data.get_report_users(new_request, project_id) return ret.data +def get_project_report_languages(self, project_id, user): + data = ProjectViewSet(detail=True) + new_request = HttpRequest() + new_request.user = user + ret = data.get_report_languages(new_request, project_id) + return ret.data def task_search_filter(videos, search_dict, filter_dict): if search_dict is not None: diff --git a/backend/organization/views.py b/backend/organization/views.py index 0a7d35a0..91fa1891 100644 --- a/backend/organization/views.py +++ b/backend/organization/views.py @@ -27,7 +27,6 @@ from translation.models import Translation import json from translation.metadata import TRANSLATION_LANGUAGE_CHOICES -from project.views import ProjectViewSet from django.http import HttpRequest from django.db.models import Q import logging @@ -35,7 +34,6 @@ from django.db.models import Value from django.db.models.functions import Concat from .utils import * -from project.views import ProjectViewSet from .tasks import * @@ -622,13 +620,6 @@ def list_org_tasks(self, request, pk=None, *args, **kwargs): status=status.HTTP_200_OK, ) - def get_project_report_languages(self, project_id, user): - data = ProjectViewSet(detail=True) - new_request = HttpRequest() - new_request.user = user - ret = data.get_report_languages(new_request, project_id) - return ret.data - @swagger_auto_schema(method="get", responses={200: "Success"}) @action( detail=True,