feat/join

account/migrations/0004_user_point.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1 on 2022-08-18 08:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0003_user_is_admin'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='point',
+            field=models.IntegerField(null=True),
+        ),
+    ]

account/models.py

@@ -40,9 +40,20 @@ class User(AbstractBaseUser,PermissionsMixin):
     profile_image = models.ImageField(blank=True)
     username = models.CharField(max_length=30,null=True)
     univ = models.CharField(max_length=30,null=True)
+
+    point = models.IntegerField(null=True)
+
+
+
+
+
+
+
+
     is_qr_scanned = models.BooleanField(default=False)
 
 
+
     is_admin = models.BooleanField(default=False)
 
     objects = UserManager()

account/serializer.py

@@ -1,26 +1,28 @@
 from rest_framework import serializers
 from django.contrib.auth import get_user_model
-
+import random
 User = get_user_model()
 
 
 class RegisterSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
         # fields = '__all__'
-        fields = ('id','profile_image','username','email', 'password', 'univ')
+        fields = ('id','profile_image','username','email', 'password', 'univ',)
 
     def create(self, validated_data):
         email = validated_data.get('email')
         password = validated_data.get('password')
         username = validated_data.get('username')
         profile_image = validated_data.get('profile_image')
         univ = validated_data.get('univ')
+        point = random.randint(1,100)
         user = User(
             email=email,
             username = username,
             profile_image = profile_image,
-            univ = univ
+            univ = univ,
+            point = point
         )
         user.set_password(password)
         user.save()

friend/admin.py

@@ -1,3 +1,4 @@
 from django.contrib import admin
+from .models import UserPoint
 
-# Register your models here.
+admin.site.register(UserPoint)

friend/migrations/0001_initial.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1 on 2022-08-17 19:34
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserPoint',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('point', models.IntegerField()),
+                ('friend_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='friend', to=settings.AUTH_USER_MODEL)),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owner', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

friend/migrations/0002_alter_userpoint_point.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1 on 2022-08-17 19:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('friend', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpoint',
+            name='point',
+            field=models.IntegerField(null=True),
+        ),
+    ]

friend/migrations/0003_friends.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.1 on 2022-08-18 08:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('friend', '0002_alter_userpoint_point'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Friends',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('friendId', models.EmailField(max_length=254)),
+                ('count', models.IntegerField()),
+                ('myId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

friend/models.py

@@ -1,3 +1,16 @@
 from django.db import models
+from account.models import User
+
 
 # Create your models here.
+class Friends(models.Model):
+    myId = models.ForeignKey(User, on_delete=models.CASCADE)
+    friendId = models.EmailField()
+    count = models.IntegerField()
+
+
+class UserPoint(models.Model):
+    owner = models.ForeignKey(User,null=True,on_delete=models.CASCADE,related_name='owner')
+    friend_id = models.ForeignKey(User,null=True,on_delete=models.CASCADE,related_name='friend')
+    point = models.IntegerField(null=True)
+

friend/serializer.py

@@ -0,0 +1,18 @@
+from rest_framework import serializers
+from mypage.models import Plan
+
+#친구의 약속목록을 모두 가져옵니다.
+class friendsPlanSerializer(serializers.ModelSerializer):
+    is_mine = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Plan
+        fields = ('id','isDone','title','promise_time','is_mine')
+
+    def get_is_mine(self, obj):
+        if obj.user == self.context['request'].user:
+            return True
+        else:
+            return False
+
+

friend/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+from friend import views
+from django.views.decorators.csrf import csrf_exempt
+
+urlpatterns = [
+    path('create/<int:plan_id>',views.join),
+    path('rank',views.RankList.as_view()),
+    path('plan/<int:friend_id>/',views.listPlans.as_view()),
+
+]

friend/views.py

@@ -1,3 +1,50 @@
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
+from rest_framework.decorators import api_view
+from account.serializer import UserSerializer
+# from friend.models import UserPoint
+from account.models import User
+from mypage.models import Plan 
+from rest_framework.response import Response
 
-# Create your views here.
+
+from .serializer import friendsPlanSerializer
+from rest_framework import generics
+
+#- 친구의 약속목록을 모두 가져옵니다
+#    - parameter {
+#    friend-id :Int 친구의 아이디,
+#    present_time: 오늘 날짜
+#    }
+
+class listPlans(generics.ListCreateAPIView):
+    lookup_field = 'id'
+    def get(self, request):
+        # friendId = request.GET.get('friend-id', None)
+        # presentTime = request.GET.get('present_time', None)
+        friendId = request.data['friend_id']
+        presentTime = request.data['present_time']
+        #GET 요청의 파라미터로 friend-id와 present_time 받음
+        #해당 friend-id를 가진 사용자의 약속 중 present_time 후에 있는 약속 목록을 가져옴
+        queryset = Plan.objects.filter(user_id=friendId, promise_time__gte=int(presentTime))
+        serializer_class = friendsPlanSerializer(queryset, many=True)
+
+        return Response(serializer_class.data, status=201)
+
+
+@api_view(['POST'])
+def join(request,plan_id):  # 내가 plan에 동참 누르면 plan의 주인의 point가 1 증가
+
+    plan = get_object_or_404(Plan,pk=plan_id)
+    user = get_object_or_404(User,pk=plan.user.id)
+    user.point+=1
+    user.save()
+
+    return Response(status=200)
+
+class RankList(generics.ListCreateAPIView):
+    queryset = User.objects.all().order_by('-point')
+    serializer_class = UserSerializer
+    lookup_field = 'id'
+
+
+

musterd/urls.py

@@ -5,7 +5,7 @@
     path('admin/', admin.site.urls),
     path('account/', include('account.urls')),
     path('mypage/', include('mypage.urls')),
-    # path('friend/', include('friend.urls')),
+    path('friend/', include('friend.urls')),
     path('search/', include('search.urls')),
     path('travel-stamp', TravelStampAPIView.as_view())
 ]

mypage/migrations/0004_plan_joiner.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.1 on 2022-08-17 19:34
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('mypage', '0003_rename_email_plan_user_plan_count_alter_plan_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='plan',
+            name='joiner',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='join', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

mypage/migrations/0005_remove_plan_joiner_plan_joiner.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1 on 2022-08-17 19:44
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('mypage', '0004_plan_joiner'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='plan',
+            name='joiner',
+        ),
+        migrations.AddField(
+            model_name='plan',
+            name='joiner',
+            field=models.ManyToManyField(null=True, related_name='join', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

mypage/migrations/0006_alter_plan_joiner.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1 on 2022-08-18 08:22
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('mypage', '0005_remove_plan_joiner_plan_joiner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='plan',
+            name='joiner',
+            field=models.ManyToManyField(related_name='join', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

mypage/models.py

@@ -14,6 +14,7 @@ class Plan(models.Model):
     name=models.CharField(max_length=30)
     category=models.CharField(max_length=30)
     count=models.IntegerField(default=1)
+    joiner = models.ManyToManyField(User,related_name='join')
 
     def __str__(self):
         return self.user.email

mypage/serializers.py

@@ -4,7 +4,7 @@
 class planSerializers(serializers.ModelSerializer):
     class Meta:
         model = Plan
-        fields = ('title', 'category','place_name','place_id','promise_time','max_count','user')
+        fields = ('title', 'category','place_name','place_id','promise_time','max_count','user','joiner')
         extra_kwargs = {
             'isDone': {'write_only': True},
         }

mypage/views.py

@@ -9,6 +9,8 @@
 from rest_framework.exceptions import ValidationError
 from http import HTTPStatus
 from rest_framework import generics
+from rest_framework.decorators import api_view
+from friend.models import UserPoint
 # <class promise>
 # GET /mypage/promise_place/:plan_id
 # PATCH /mypage/finish/:plan_id
@@ -76,4 +78,23 @@ def patch(self,request,plan_id):
 class PlanList(generics.ListCreateAPIView):
     queryset = Plan.objects.all() #객체를 반환하는데 사용
     serializer_class = planSerializers
-    lookup_field = 'id'
+    lookup_field = 'id'
+
+
+# @api_view(['POST']) # plan 작성 완료버튼 누르면 reward 내용까지 저장  프론트에서 reward받아와야함 plan_id도
+# def save_with_reward(request,plan_id):
+#     plan = Plan.objects.get(pk=plan_id)
+#     # plan.reward = request.data['reward']
+#     # plan.save()
+
+#     for i in (plan.joiner-1): #일단 3개 만들고
+#         joiner_UserPoint = UserPoint() #UserPoint 객체 생성
+#         nowuser = get_object_or_404(User,pk=plan.joiner[i])
+#         joiner_UserPoint.owner = nowuser # UserPoint 객체의 owner필드에 요청한'사람'을 저장 
+#         joiner_UserPoint.point = 0
+#         joiner_UserPoint.save()
+
+#     for j in plan.joiner:
+#             friend = get_object_or_404(User,pk=plan.joiner[j])
+#             nowuser.friend_id = friend
+

search/views.py

@@ -10,7 +10,7 @@
 
 class search_friend(APIView):
     def get(self, request):
-        queryset = User.objects.all()
+        queryset = User.objects.filter(username__contains = request.data['name']) # 언더바 2개임
         serializer_class = friendSerializers(queryset, many=True)
         serialized_data=serializer_class.data
         return Response(serialized_data)