Skip to content

Commit

Permalink
πŸ› Fix: msm 상황별
Browse files Browse the repository at this point in the history
  • Loading branch information
jiyoon607 committed Oct 6, 2024
1 parent 0134e94 commit 883142d
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 0 deletions.
44 changes: 44 additions & 0 deletions accounts/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated by Django 5.1.1 on 2024-10-05 23:56

import django.contrib.auth.models
import django.contrib.auth.validators
import django.utils.timezone
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
('auth', '0012_alter_user_first_name_max_length'),
]

operations = [
migrations.CreateModel(
name='User',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('phone_number', models.CharField(max_length=20)),
('nickname', models.CharField(max_length=20)),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'abstract': False,
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
]
4 changes: 4 additions & 0 deletions waiting/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,25 @@ def check_ready_to_confirm(waiting_id):
waiting.set_time_over_canceled() # μ‹œκ°„ 초과둜 μ·¨μ†Œ 처리
# 문자 λ©”μ‹œμ§€ λ°œμ†‘
phone_number = waiting.user.phone_number
print(phone_number)
sendsms(phone_number, f"[λΌμΈλ‚˜μš°] 3λΆ„ 내에 λΆ€μŠ€ μž…μž₯을 ν™•μ •ν•˜μ§€ μ•Šμ•„, λŒ€κΈ°κ°€ μ·¨μ†Œλ˜μ—ˆμ–΄μš”")
except Waiting.DoesNotExist:
pass

@shared_task
def check_confirmed(waiting_id):
print("기닀림은 끝")
"""10λΆ„ ν›„ μž…μž₯ ν™•μ • μƒνƒœμ—μ„œ λ„μ°©ν•˜μ§€ μ•ŠμœΌλ©΄ time_over_canceled μƒνƒœλ‘œ λ³€κ²½"""
from .models import Waiting
try:
print("데이터가져와")
waiting = Waiting.objects.get(pk=waiting_id)
# 10뢄이 μ§€λ‚¬μœΌλ©΄ μ·¨μ†Œ 처리
if waiting.is_confirmed_expired() and waiting.waiting_status == 'confirmed':
waiting.set_time_over_canceled() # μ‹œκ°„ 초과둜 μ·¨μ†Œ 처리
# 문자 λ©”μ‹œμ§€ λ°œμ†‘
phone_number = waiting.user.phone_number
print(phone_number)
sendsms(phone_number, f"[λΌμΈλ‚˜μš°] 10λΆ„ 내에 λΆ€μŠ€μ— μž…μž₯ν•˜μ§€ μ•Šμ•„, λŒ€κΈ°κ°€ μ·¨μ†Œλ˜μ—ˆμ–΄μš”")
except Waiting.DoesNotExist:
pass

0 comments on commit 883142d

Please sign in to comment.