Merge pull request #75 from plers-org/sm/#72

Sm/#72

.github/workflows/workflow.yml

@@ -49,4 +49,4 @@ jobs:
                       docker stop ${{ secrets.DOCKER_HUB_REPO }}
                       docker rm -f ${{ secrets.DOCKER_HUB_REPO }}
                       docker rmi ${{ secrets.DOCKER_HUB_USERNAME }}/${{ secrets.DOCKER_HUB_REPO }}:latest
-                      docker compose --env-file ./colio-server/.env up -d
+                      docker compose up -d

users/models.py

@@ -77,7 +77,7 @@ class User(BaseModel, AbstractBaseUser, PermissionsMixin):
             self.banner_image.delete(save=False)
         super().delete(*args, **kwargs)
 
-class GithubToken(models.Model):
+class GithubToken(BaseModel):
     user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='github_token', on_delete=models.CASCADE)
     access_token = models.CharField(max_length=255, blank=True, null=True)
     refresh_token = models.CharField(max_length=255, blank=True, null=True)

users/serializers.py

@@ -76,5 +76,5 @@ class UserMemberInfoSerializer(serializers.ModelSerializer):
         ]
 
 
-class GitHubCodeSerializer(serializers.Serializer):
+class GithubCodeSerializer(serializers.Serializer):
     code  = serializers.CharField()

users/views.py

@@ -129,7 +129,7 @@ class GithubAPIViewSet(viewsets.ViewSet):
             token = self.request.user.github_token.access_token
             cache.set(cache_key, token, timeout=CACHE_TIMEOUT)
 
-        return Github(token)
+        return Github(token, per_page=COMMIT_PAGE_SIZE)
     
     @cached_property
     def github(self):
@@ -149,10 +149,18 @@ class GithubAPIViewSet(viewsets.ViewSet):
 
     @action(detail=False, methods=["get"], url_path="personal-repos")
     def personal_repos(self, request):
+        try:
+            page = int(request.query_params.get("page", 1))
+        except ValueError:
+            return Response({"is_page_int": False,"detail": "page and page_size must be integers"}, status=status.HTTP_400_BAD_REQUEST)
+
+        if page < 1:
+            return Response({"is_page_gte_1": False, "detail": "page and page_size must be >= 1"}, status=status.HTTP_400_BAD_REQUEST)
+
         user = self.github.get_user()
         data = [ 
             {'full_name': r.full_name}
-            for r in user.get_repos()
+            for r in user.get_repos().get_page(page-1)
         ]
         return Response(data, status=status.HTTP_200_OK)
     
@@ -172,13 +180,13 @@ class GithubAPIViewSet(viewsets.ViewSet):
 
         try:
             repo = self.github.get_repo(repo_full_name)
-            commits = repo.get_commits(per_page=COMMIT_PAGE_SIZE).get_page(page - 1)
+            commits = repo.get_commits().get_page(page-1)
         except Exception as e:
             return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
 
         data = [
             {"sha": c.sha, "commit_message": c.commit.message}
-            for c in commits[:COMMIT_PAGE_SIZE]
+            for c in commits
         ]
 
         return Response({
@@ -190,6 +198,7 @@ class GithubAPIViewSet(viewsets.ViewSet):
     @action(detail=False, methods=["get"], url_path="commit-files")
     def commit_files(self, request):
         repo_full, sha = request.query_params.get("repo"), request.query_params.get("sha")
+        
         if not (repo_full and sha):
             return Response({"is_query_param": False}, status=status.HTTP_400_BAD_REQUEST)
 
@@ -215,15 +224,31 @@ class GithubAPIViewSet(viewsets.ViewSet):
 
     @action(detail=False, methods=["get"], url_path="organizations")
     def organizations(self, request):
+        try:
+            page = int(request.query_params.get("page", 1))
+        except ValueError:
+            return Response({"is_page_int": False,"detail": "page and page_size must be integers"}, status=status.HTTP_400_BAD_REQUEST)
+
+        if page < 1:
+            return Response({"is_page_gte_1": False, "detail": "page and page_size must be >= 1"}, status=status.HTTP_400_BAD_REQUEST)
+
         user = self.github.get_user()
-        orgs = user.get_orgs()
+        orgs = user.get_orgs().get_page(page-1)
         data = {"org_name": [org.name for org in orgs]}
         return Response(data, status=status.HTTP_200_OK)
     
     @action(detail=False, methods=["get"], url_path="organization-repos")
     def organization_repos(self, request):
+        try:
+            page = int(request.query_params.get("page", 1))
+        except ValueError:
+            return Response({"is_page_int": False,"detail": "page and page_size must be integers"}, status=status.HTTP_400_BAD_REQUEST)
+
+        if page < 1:
+            return Response({"is_page_gte_1": False, "detail": "page and page_size must be >= 1"}, status=status.HTTP_400_BAD_REQUEST)
+
         org_name = request.query_params.get("org")
-        repos = self.github.get_organization(org_name).get_repos()
+        repos = self.github.get_organization(org_name).get_repos().get_page(page-1)
 
         data = [
             {'full_name': r.full_name}