token refresh bot, refactor api, compose, readme

Author: timabilov

README.MD

@@ -1,6 +1,6 @@
 ## timabilov / django-social-sample [![Build Status](https://travis-ci.org/timabilov/django-social-sample.svg?branch=master)](https://travis-ci.org/timabilov/django-social-sample)
 
-Install `docker` and `docker-compose` 
+Required `docker` and `docker-compose` 
 ###### docker-compose-prod.yml  is not production ready. used for `uwsgi bot setup`  ONLY. 
 
 
@@ -11,7 +11,7 @@ Add your `CLEARBIT_KEY` to configuration `env.secret` if you want.
 
 Open `http://localhost/` 
 
-For spamming/testing API in `bot/` directory
+For spamming/testing API in `bot/` directory:
 
 `python social_bot.py -u 100 -p 20 -l 20`  
 `python social_bot.py --config config.json`  

api/migrations/0003_auto_20181206_1546.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.8 on 2018-12-06 15:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_userprofile_bio'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=100, verbose_name='last_name'),
+        ),
+    ]

api/urls.py

@@ -2,7 +2,7 @@
 
 
 urlpatterns = [
-    path('v1.0/', include('api.views.v1.urls')),
+    path('v1.0/', include('api.v1.urls')),
     # There are many methods for versioning, for simple one:
     # Next(v1.1) api version refer to previous one with overriding particular
     # feature

api/views/__init__.py api/v1/__init__.py

@@ -10,8 +10,8 @@
 # TODO pretend that there  is swagger route.
 
 
-from api.views.v1.views.profile import UserSignUpAPI
-from api.views.v1.views.social import PostViewSet
+from api.v1.views.profile import UserSignUpAPI
+from api.v1.views.social import PostViewSet
 
 router = SimpleRouter()
 router.register(

api/views/v1/serializers/__init__.py api/v1/serializers/__init__.py

@@ -2,7 +2,7 @@
 from rest_framework.views import APIView
 from django.utils.translation import gettext_lazy as _
 
-from api.views.v1.serializers.profile import UserRegistrationSerializer
+from api.v1.serializers.profile import UserRegistrationSerializer
 
 
 class UserSignUpAPI(APIView):

api/views/v1/serializers/profile.py api/v1/serializers/profile.py

@@ -10,7 +10,8 @@
 from rest_framework.views import APIView
 from api.models import UserProfile, Post, PostLike
 from django.utils.translation import ugettext_lazy as tr
-from api.views.v1.serializers.social import PostSerializer
+from api.v1.serializers.social import PostSerializer
+from django.db import transaction
 
 logger = logging.getLogger(__name__)
 
@@ -61,25 +62,29 @@ def like(self, *args,  **kwargs):
             like = PostLike.objects.filter(
                 post_id=post.id, reacted_id=self.request.user.id
             )
-            deleted, _ = like.delete()
-            if not deleted:
-                return JsonResponse({
-                    "message": "Not found"
-                }, status=404)
-            Post.objects.filter(id=post.id).update(likes=F('likes') - 1)
+
+            with transaction.atomic():
+                deleted, _ = like.delete()
+                if not deleted:
+                    return JsonResponse({
+                        "message": "Not found"
+                    }, status=404)
+                Post.objects.filter(id=post.id).update(likes=F('likes') - 1)
         elif self.request.method == 'POST':
             try:
-                like, created = PostLike.objects.get_or_create(
-                    post_id=post.id, reacted_id=self.request.user.id
-                )
-
-                if created:
-                    Post.objects.filter(id=post.id).update(likes=F('likes') + 1)
-                else:
-                    # we can omit this response - depends on arch and client
-                    return JsonResponse({
-                        "message": tr("You've already liked this post"),
-                    }, status=400)
+                with transaction.atomic():
+                    like, created = PostLike.objects.get_or_create(
+                        post_id=post.id, reacted_id=self.request.user.id
+                    )
+
+                    if created:
+                        Post.objects.filter(id=post.id).update(likes=F('likes') + 1)
+                    else:
+                        # we can omit this response - depends on arch and client
+                        return JsonResponse({
+                            "message": tr("You've already liked this post"),
+                        }, status=400)
+
             except IntegrityError:
                 # get or create  handles race condition problem
                 # with getting already created object

api/views/v1/serializers/social.py api/v1/serializers/social.py

@@ -12,6 +12,7 @@
 class User:
     """
      Client for simulating user behaviour handling server API.
+     Token refreshed automatically.
      Username and password is necessary for refreshing token.
     """
 
@@ -77,18 +78,39 @@ def __exhausted_limit(self, attr):
 
         return False
 
-    async def _request(self, method, url, *args, **kwargs):
+    async def _token_lock(self):
+
+        while not self.token:
+            await asyncio.sleep(0.1)
+
+        return True
+
+    async def _request(self, method, url, auth_header=True, *args, **kwargs):
 
         exc = None
-        if self.token:
-            kwargs.setdefault('headers', {}).update(self._auth_header())
+        # attempts for disconnect or token expiration.
+        for i in range(10):
+
+            if self.token:
+                kwargs.setdefault('headers', {}).update(self._auth_header())
 
-        # server drops connection so we use 20 attempts to not miss any req.
-        for i in range(20):
             try:
                 async with self.session.request(method, url, *args, **kwargs) as response:
 
-                    # TODO: check if status 401 refresh token
+                    if response.status == 401:
+                        if auth_header and not self.token:
+
+                            # other tasks for that user most likely will get 401
+                            # too, lock until new token issued.
+                            # TODO: implement proper lock/pause
+                            await self._token_lock()
+                            continue
+                        response.close()
+
+                        self.token = None
+                        await self._get_token()
+
+                        continue
                     return await response.json(), response.status
 
             except aiohttp.ClientError as e:
@@ -108,6 +130,7 @@ async def _get_token(self):
         # we can load users from some file or external resources as example
 
         response, status = await self._request('POST', User.LOGIN_URL,
+                                               auth_header=False,
                                                data={
                                                     "username": self.username,
                                                     "password": self.password
@@ -151,6 +174,7 @@ async def like(self, post_id):
 
     async def signup(self):
         _, status = await self._request('POST', User.SIGNUP_URL,
+                                        auth_header=False,
                                         data={
                                             "username": self.username,
                                             "password": self.password

api/views/v1/tests/__init__.py api/v1/tests/__init__.py

@@ -1,6 +1,7 @@
 import argparse
 import json
 import logging
+import random
 
 import sys
 from json import JSONDecodeError
@@ -72,12 +73,16 @@ async def simulate_when_done(coro):
 
 async def main():
 
-    async with aiohttp.ClientSession(connector=aiohttp.TCPConnector()) as session:
+    async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(force_close=True)) as session:
 
         logger.info('Start generating users...')
-        tasks = [asyncio.ensure_future(User.generate(session)) for _ in range(RULES['users'])]
+        tasks = [asyncio.ensure_future(User.generate(
+            session,
+            max_posts=random.randint(0, RULES['max_user_posts']),
+            max_likes=random.randint(0, RULES['max_user_likes']),
+        )) for _ in range(RULES['users'])]
 
-        logger.info('Waiting for generating content...')
+        logger.info('Waiting for content generation...')
         # Start simulation right after release of each task
         await asyncio.gather(*[
             asyncio.ensure_future(simulate_when_done(awaited_user))
@@ -90,3 +95,4 @@ async def main():
     asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
     loop = asyncio.get_event_loop()
     loop.run_until_complete(main())
+

api/views/v1/tests/test_profile.py api/v1/tests/test_profile.py

@@ -3,7 +3,7 @@ version: '3'
 services:
 
   db:
-    image: postgres
+    image: postgres:10
     volumes:
       - pgdata:/var/lib/postgresql/data
 

api/views/v1/tests/test_social.py api/v1/tests/test_social.py

@@ -3,4 +3,4 @@ set -e
 python manage.py makemigrations --noinput
 python manage.py migrate
 python manage.py collectstatic --noinput
-uwsgi --http 0.0.0.0:8000 --module socialplatform.wsgi:application --processes 1 --threads 4
+uwsgi --http 0.0.0.0:8000 --module socialplatform.wsgi:application --processes 2 --threads 4

api/views/v1/urls.py api/v1/urls.py

@@ -145,3 +145,10 @@
 
 CLEARBIT_API_URL = 'https://person.clearbit.com/v2/'
 CLEARBIT_API_KEY = os.environ.get('CLEARBIT_KEY')
+
+
+from datetime import timedelta
+
+SIMPLE_JWT = {
+    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=30),
+}

api/views/v1/views/__init__.py api/v1/views/__init__.py

@@ -5,7 +5,7 @@
 from django.shortcuts import render_to_response
 
 from api.models import Post, PostLike
-from api.views.v1.serializers.social import PostSerializer
+from api.v1.serializers.social import PostSerializer
 
 
 def index(request):