nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed conflict utils file and folder

Browse Source
This commit is contained in:
Akira Miyata
2025-01-22 18:14:12 +09:00
parent c00bfe9956
commit b4452be046
5 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rog/services/csv_processor.py
View File

@ -9,8 +9,8 @@ from datetime import timedelta
import csv import csv
from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2 from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2
from ..utils.date_converter import DateConverter from ..utils_code.date_converter import DateConverter
from ..utils.name_splitter import NameSplitter from ..utils_code.name_splitter import NameSplitter
class EntryCSVProcessor: class EntryCSVProcessor:
def __init__(self): def __init__(self):

0
rog/utils/__init__.py → rog/utils_code/__init__.py
View File

0
rog/utils/date_converter.py → rog/utils_code/date_converter.py
View File

0
rog/utils/name_splitter.py → rog/utils_code/name_splitter.py
View File

2
rog/views.py
View File

@ -17,7 +17,7 @@ import requests
from rest_framework import serializers from rest_framework import serializers
from django.db import IntegrityError from django.db import IntegrityError
from django.urls import reverse 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 from django.conf import settings
import uuid import uuid
from rest_framework.exceptions import ValidationError as DRFValidationError from rest_framework.exceptions import ValidationError as DRFValidationError