From b4452be046d2d1834b36394a16d149170601529d Mon Sep 17 00:00:00 2001
From: Akira <akira.miyata@sumasen.net>
Date: Wed, 22 Jan 2025 18:14:12 +0900
Subject: [PATCH] Fixed conflict utils file and folder

---
 rog/services/csv_processor.py               | 4 ++--
 rog/{utils => utils_code}/__init__.py       | 0
 rog/{utils => utils_code}/date_converter.py | 0
 rog/{utils => utils_code}/name_splitter.py  | 0
 rog/views.py                                | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename rog/{utils => utils_code}/__init__.py (100%)
 rename rog/{utils => utils_code}/date_converter.py (100%)
 rename rog/{utils => utils_code}/name_splitter.py (100%)

diff --git a/rog/services/csv_processor.py b/rog/services/csv_processor.py
index 64bd132..2207365 100644
--- a/rog/services/csv_processor.py
+++ b/rog/services/csv_processor.py
@@ -9,8 +9,8 @@ from datetime import timedelta
 import csv
 
 from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2
-from ..utils.date_converter import DateConverter
-from ..utils.name_splitter import NameSplitter
+from ..utils_code.date_converter import DateConverter
+from ..utils_code.name_splitter import NameSplitter
 
 class EntryCSVProcessor:
     def __init__(self):
diff --git a/rog/utils/__init__.py b/rog/utils_code/__init__.py
similarity index 100%
rename from rog/utils/__init__.py
rename to rog/utils_code/__init__.py
diff --git a/rog/utils/date_converter.py b/rog/utils_code/date_converter.py
similarity index 100%
rename from rog/utils/date_converter.py
rename to rog/utils_code/date_converter.py
diff --git a/rog/utils/name_splitter.py b/rog/utils_code/name_splitter.py
similarity index 100%
rename from rog/utils/name_splitter.py
rename to rog/utils_code/name_splitter.py
diff --git a/rog/views.py b/rog/views.py
index 9b3024c..33410b7 100644
--- a/rog/views.py
+++ b/rog/views.py
@@ -17,7 +17,7 @@ import requests
 from rest_framework import serializers
 from django.db import IntegrityError
 from django.urls import reverse
-from .utils import S3Bucket, send_verification_email,send_invitation_email,send_team_join_email,send_reset_password_email
+from .utils_code import S3Bucket, send_verification_email,send_invitation_email,send_team_join_email,send_reset_password_email
 from django.conf import settings
 import uuid
 from rest_framework.exceptions import ValidationError as DRFValidationError