Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
32dd694
[feat#5] login 기능
yunzzoii Nov 16, 2021
5354e89
Merge pull request #8 from teenting/feat#5
yunzzoii Nov 16, 2021
cb651e1
Merge branch 'develop' into feat#7
Sonjeongbeom Nov 18, 2021
c4d00fe
Merge pull request #11 from teenting/feat#7
Sonjeongbeom Nov 18, 2021
e96b2b4
[feat#6] mission, achievement model
yunzzoii Nov 18, 2021
20134ae
Merge pull request #12 from teenting/feat#6
yunzzoii Nov 18, 2021
d727dae
[feat#14] 모델 수정
yunzzoii Nov 18, 2021
7b9226a
Merge pull request #17 from teenting/feat#14
yunzzoii Nov 18, 2021
5154bac
[feat#13] user model 수정
yunzzoii Nov 18, 2021
ce1aff9
Merge pull request #18 from teenting/feat#13
yunzzoii Nov 18, 2021
02239c1
[feat#19] user, child viewset 추가
Nov 18, 2021
dca1f55
Merge pull request #23 from teenting/feat#19
Sonjeongbeom Nov 18, 2021
0e60fef
[feat#20] 잔액조회, 거래내역조회 view 구현
Nov 21, 2021
e8f7fff
Merge pull request #24 from teenting/feat#20
Sonjeongbeom Nov 21, 2021
9595aa7
[feat#26] 분석페이지 view 구현
Nov 21, 2021
8eea16a
[feat#22] assignment 기능 구현
yunzzoii Nov 21, 2021
2894d75
Merge pull request #27 from teenting/feat#26
Sonjeongbeom Nov 21, 2021
165a0c9
Merge branch 'develop' into feat#22
yunzzoii Nov 21, 2021
659b9a2
Merge pull request #28 from teenting/feat#22
yunzzoii Nov 21, 2021
8baeb6f
[feat#25] 송금 api 완성
yunzzoii Nov 21, 2021
0c27a18
Merge pull request #30 from teenting/feat#25
yunzzoii Nov 21, 2021
1628a81
[feat#29] user모델 수정
Nov 21, 2021
2c38e1a
Merge branch 'develop' into feat#29
yunzzoii Nov 21, 2021
dd17ec1
Merge pull request #32 from teenting/feat#29
yunzzoii Nov 21, 2021
3860c27
[feat#31] assignment에 대한 권한 변경 및 mission update
yunzzoii Nov 22, 2021
460e01a
Merge pull request #35 from teenting/feat#31
yunzzoii Nov 22, 2021
0c8ea96
[feat#33] 부모 거래내역 api
Nov 22, 2021
2753999
Merge branch 'develop' into feat#33
Sonjeongbeom Nov 22, 2021
e61e5c2
Merge pull request #36 from teenting/feat#33
Sonjeongbeom Nov 22, 2021
2f6a5a0
[feat#34] MySQL 연동
yunzzoii Nov 22, 2021
a7e0b74
Merge pull request #37 from teenting/feat#34
yunzzoii Nov 22, 2021
0e30eb2
lightsail host add
yunzzoii Nov 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
asgiref==3.4.1
certifi==2021.10.8
cffi==1.15.0
charset-normalizer==2.0.7
cryptography==35.0.0
defusedxml==0.7.1
Django==3.2.9
django-allauth==0.46.0
django-rest-auth==0.9.5
djangorestframework==3.12.4
idna==3.3
oauthlib==3.1.1
pycparser==2.21
PyJWT==2.3.0
python-dateutil==2.8.2
python3-openid==3.2.0
pytz==2021.3
requests==2.26.0
requests-oauthlib==1.3.0
six==1.16.0
sqlparse==0.4.2
urllib3==1.26.7
4 changes: 3 additions & 1 deletion teeting_backend/assignment/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from django.contrib import admin

from .models import Mission, Achievement
# Register your models here.
admin.site.register(Mission)
admin.site.register(Achievement)
3 changes: 3 additions & 0 deletions teeting_backend/assignment/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
class AssignmentConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'assignment'
def ready(self) -> None:
import assignment.signals
return super().ready()
32 changes: 32 additions & 0 deletions teeting_backend/assignment/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import datetime
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Achievement',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('level', models.IntegerField(choices=[(1, 'level1'), (2, 'level2'), (3, 'level3'), (4, 'level4'), (5, 'level5'), (6, 'level6'), (7, 'level7'), (8, 'level8'), (9, 'level9')])),
('score', models.IntegerField(default=0)),
],
),
migrations.CreateModel(
name='Mission',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('begDate', models.DateTimeField(default=datetime.datetime.now)),
('expDate', models.DateTimeField(default=datetime.datetime.now)),
('status', models.IntegerField(choices=[(0, 'fail'), (1, 'success'), (2, 'doing'), (3, 'finished')], default=2)),
('content', models.CharField(max_length=200)),
('reward', models.IntegerField()),
],
),
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.9 on 2021-11-16 11:53
# Generated by Django 3.2.9 on 2021-11-22 05:37

from django.conf import settings
from django.db import migrations, models
Expand All @@ -10,24 +10,25 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('finance', '0001_initial'),
('ttAccount', '0001_initial'),
('assignment', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AddField(
model_name='transaction',
name='user',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
model_name='mission',
name='child',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='mission', to='ttAccount.child'),
),
migrations.AddField(
model_name='balance',
name='currentUser',
field=models.OneToOneField(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
model_name='mission',
name='parent',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='analysis',
name='transaction',
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='finance.transaction'),
model_name='achievement',
name='child',
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='achievement_child', to='ttAccount.child'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.9 on 2021-11-22 07:26

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('assignment', '0002_initial'),
]

operations = [
migrations.AlterField(
model_name='achievement',
name='level',
field=models.IntegerField(choices=[(1, 'level1'), (2, 'level2'), (3, 'level3'), (4, 'level4'), (5, 'level5'), (6, 'level6'), (7, 'level7'), (8, 'level8'), (9, 'level9')], default=1),
),
]
42 changes: 41 additions & 1 deletion teeting_backend/assignment/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
from django.db import models

from django.db.models.deletion import CASCADE
from django.urls.resolvers import _PATH_PARAMETER_COMPONENT_RE
from ttAccount.models import User, Child
from datetime import datetime
# Create your models here.

class Mission(models.Model):
STATUS = (
(0, 'fail'), # 기한이 지나서 실패
(1, 'success'), # 미션 성공, 송금하지 않은 상태
(2, 'doing'), # 미션 진행중
(3, 'finished') # 성공 후 송금 완료
)
parent = models.ForeignKey(User, on_delete=CASCADE, default=1)
child = models.ForeignKey(Child, on_delete=CASCADE, related_name='mission', default=1)
begDate = models.DateTimeField(default=datetime.now)
expDate = models.DateTimeField(default=datetime.now)
status = models.IntegerField(default=2, choices=STATUS)
content = models.CharField(max_length=200)
reward = models.IntegerField()

def __str__(self):
return self.content

class Achievement(models.Model):
LEVEL_CHOICES = (
(1, 'level1'),
(2, 'level2'),
(3, 'level3'),
(4, 'level4'),
(5, 'level5'),
(6, 'level6'),
(7, 'level7'),
(8, 'level8'),
(9, 'level9')
)
child = models.OneToOneField(Child, on_delete=CASCADE, related_name='achievement_child')
level = models.IntegerField(choices=LEVEL_CHOICES, default=1)
score = models.IntegerField(default=0)

def __str__(self):
return self.child.firstname + ' score'
13 changes: 13 additions & 0 deletions teeting_backend/assignment/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from django.db import models
from django.db.models import fields
from rest_framework import serializers
from .models import Mission, Achievement

class MissionSerializer(serializers.ModelSerializer):
class Meta:
model = Mission
fields = '__all__'
class AchievementSerializer(serializers.ModelSerializer):
class Meta:
model = Achievement
fields = '__all__'
55 changes: 55 additions & 0 deletions teeting_backend/assignment/signals.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
from django.db.models.signals import post_save
from django.core.signals import request_started
from django.db.models import F
from django.dispatch import receiver
from .models import Mission, Achievement
from datetime import datetime
# mission이 finished (& transferred..?) 되면 achievement의 score가 update
# achievement의 score가 update되면 achievement의 level이 update
@receiver(post_save, sender=Mission)
def update_achievement_score(sender, **kwargs):
childid = kwargs['instance'].child_id
status = kwargs['instance'].status
reward = kwargs['instance'].reward
try:
if status == 3:
Achievement.objects.filter(child_id=childid).update(score=F('score') + (reward * 0.01))
except:
pass
@receiver(post_save, sender=Achievement)
def update_achievement_level(sender, **kwargs):
childid = kwargs['instance'].child_id
score = kwargs['instance'].score
try:
if score < 500:
Achievement.objects.filter(child_id=childid).update(level=1)
elif score < 1000:
Achievement.objects.filter(child_id=childid).update(level=2)
elif score < 1500:
Achievement.objects.filter(child_id=childid).update(level=3)
elif score < 2000:
Achievement.objects.filter(child_id=childid).update(level=4)
elif score < 2500:
Achievement.objects.filter(child_id=childid).update(level=5)
elif score < 3000:
Achievement.objects.filter(child_id=childid).update(level=6)
elif score < 3500:
Achievement.objects.filter(child_id=childid).update(level=7)
elif score < 4000:
Achievement.objects.filter(child_id=childid).update(level=8)
else:
Achievement.objects.filter(child_id=childid).update(level=9)
except:
pass

# 현재 접근 시간보다 mission의 expDate가 이전이면 status를 fail로
@receiver(request_started)
def date_expire(sender, **kwargs):
current = datetime.now().date()
try:
for mission in list(Mission.objects.all()):
if mission.status == 2 and mission.expDate.date() < current:
mission.status = 0 #fail
mission.save()
except:
print('error')
12 changes: 12 additions & 0 deletions teeting_backend/assignment/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import routers, urlpatterns
from rest_framework.routers import DefaultRouter
from django.urls import path, include
from assignment import views

router = DefaultRouter()
router.register(r'mission', views.MissionViewSet, basename='mission')
router.register(r'achievement', views.AchievementViewSet, basename='achievement')

urlpatterns = [
path('', include(router.urls))
]
53 changes: 53 additions & 0 deletions teeting_backend/assignment/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,56 @@
from django.http import request
from django.shortcuts import render
from rest_framework.permissions import IsAuthenticated
from rest_framework.authentication import TokenAuthentication
from rest_framework import viewsets


from ttAccount.models import Child
from .models import Mission, Achievement
from .serializers import MissionSerializer, AchievementSerializer
# Create your views here.

class MissionViewSet(viewsets.ModelViewSet):
permission_classes = [IsAuthenticated]
authentication_classes = [TokenAuthentication]
queryset = Mission.objects.all()
serializer_class = MissionSerializer
#해당 child에 대해서만 나오게 하려면

def get_queryset(self):
qs = super().get_queryset()
if self.request.method == "GET":
if self.request.user.is_authenticated : # 로그인 유무
childid = self.request.query_params.get("childId", None)
# childid가 존재하고 현재 로그인 된 유저의 자식일때만 반영
if childid is not None and Child.objects.filter(id=childid).first().parent == self.request.user:
qs = Mission.objects.filter(child_id=childid)
else:
qs = qs.none()
else:
qs = qs.none()
return qs

def update(self, request, *args, **kwargs):
kwargs['partial'] = True
return super().update(request, *args, **kwargs)


class AchievementViewSet(viewsets.ModelViewSet):
permission_classes = [IsAuthenticated]
authentication_classes = [TokenAuthentication]
queryset = Achievement.objects.all()
serializer_class = AchievementSerializer

def get_queryset(self):
qs = super().get_queryset()
if self.request.user.is_authenticated : # 로그인 유무
childid = self.request.query_params.get("childId", None)
# childid가 존재하고 현재 로그인 된 유저의 자식일때만 반영
if childid is not None and Child.objects.filter(id=childid).first().parent == self.request.user:
qs = Achievement.objects.filter(child_id=childid)
else:
qs = qs.none()
else:
qs = qs.none()
return qs
23 changes: 4 additions & 19 deletions teeting_backend/finance/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Generated by Django 3.2.9 on 2021-11-16 11:53
# Generated by Django 3.2.9 on 2021-11-22 05:37


import django.core.validators
from django.db import migrations, models
Expand All @@ -16,27 +17,11 @@ class Migration(migrations.Migration):
name='Analysis',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('category', models.CharField(max_length=200)),
],
),
migrations.CreateModel(
name='Balance',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('balance', models.IntegerField(default=0)),
],
),
migrations.CreateModel(
name='Transaction',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('trdd', models.CharField(max_length=8)),
('txtm', models.CharField(max_length=6)),
('mnrcDrotDsnc', models.IntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)])),
('date', models.DateField()),
('tram', models.IntegerField(validators=[django.core.validators.MinValueValidator(0)])),
('aftrBlnc', models.IntegerField()),
('bnprCntn', models.TextField()),
('tuno', models.IntegerField()),
('category', models.IntegerField(choices=[(0, '식비'), (1, '교통비'), (2, '문화생활비'), (3, '기타')], default=0)),
],
),
]
22 changes: 22 additions & 0 deletions teeting_backend/finance/migrations/0002_analysis_child.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 3.2.9 on 2021-11-22 05:37

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('ttAccount', '0001_initial'),
('finance', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='analysis',
name='child',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='ttAccount.child'),
),
]
Loading