update dependencies

ashwin31 · ashwin31 · commit b0418f0dbbc3 · 2025-02-28T10:08:05.000+05:30
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ deploy_live:
     - sudo /bin/rm -rf /home/peeljobs/peeljobs/; cp -r . /home/peeljobs/peeljobs
     - source /home/peeljobs/env/bin/activate
     - pip install pipenv
-    - pipenv install
+    - pipenv install -d
     - python /home/peeljobs/peeljobs/manage_server.py migrate --noinput
     - sudo /usr/bin/supervisorctl restart all
   tags:
diff --git a/.runcode.yaml b/.runcode.yaml
@@ -21,7 +21,7 @@ onCreate:
         cp ENV.md .env
         pip install -U pip
         pip install pipenv
-        pipenv install
+        pipenv install -d
         python manage.py migrate
         python manage.py loaddata industries
         python manage.py loaddata qualification
diff --git a/.travis.yaml b/.travis.yaml
@@ -20,7 +20,7 @@ env:
 
 install:
   - pip install pipenv
-  - pipenv install
+  - pipenv install -d
 
 #new
 #creating a database
diff --git a/Pipfile b/Pipfile
@@ -5,24 +5,17 @@ name = "pypi"
 
 [packages]
 arrow = "==1.2.3"
-behave-django = "==1.4.0"
-black = "==25.1.0"
 boto3 = "==1.24.78"
-bpython = "==0.23"
-coverage = "==6.4.4"
 django = "==4.2.19"
-django-behave = "==0.1.6"
 django-celery-beat = "==2.7.0"
 django-compressor = "==4.1"
 django-cors-headers = "==3.13.0"
-django-debug-toolbar-template-profiler = "==2.1.0"
 django-haystack = "==3.2.1"
 django-ses = "==4.4.0"
 django-ses-gateway = "==0.1.1"
 django-tellme = {git = "https://github.com/ludrao/django-tellme"}
 elasticsearch = "==7.17.6"
 google-api-python-client = "==2.62.0"
-prospector = "==1.7.7"
 psycopg2-binary = "==2.9.3"
 python-dotenv = "==0.21.0"
 python-memcached = "==1.59"
@@ -34,8 +27,6 @@ pyjwt = "==2.5.0"
 djangorestframework = "==3.15.2"
 djangorestframework-simplejwt = "==5.5.0"
 sentry-sdk = "==2.22.0"
-pip-check = "==2.7"
-flake8-polyfill = "==1.0.2"
 django-pymemcache = "==1.0.0"
 contextlib2 = "==21.6.0"
 django-blog-it = "==0.3.1"
@@ -47,6 +38,15 @@ olefile = "==0.46"
 tinys3 = "==0.1.12"
 
 [dev-packages]
+behave-django = "==1.4.0"
+django-behave = "==0.1.6"
+black = "==25.1.0"
+bpython = "==0.23"
+coverage = "==7.6.12"
+django-debug-toolbar-template-profiler = "==2.1.0"
+prospector = "==1.15.1"
+flake8-polyfill = "==1.0.2"
+pip-check = "==2.9"
 
 [requires]
 python_version = "3.10"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ add the following to your path
 ##### Install requirements
 
 ```bash
-pipenv install
+pipenv install -d
 ```
 
 For env variables, refer to env.md in source directory and you need to create a .env file to keep all env variables with their respective values.
diff --git a/agency/views.py b/agency/views.py
@@ -5,7 +5,7 @@
 
 from django.urls import reverse
 from django.db.models import Q
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
 
 from mpcomp.views import (
diff --git a/candidate/views.py b/candidate/views.py
@@ -6,7 +6,7 @@
 import re
 
 from django.shortcuts import render
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.utils import timezone
diff --git a/dashboard/views.py b/dashboard/views.py
@@ -15,7 +15,7 @@
 from django.urls import reverse
 from django.db.models import Count, Q
 from django.forms import modelformset_factory
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template import loader
 from django.template.defaultfilters import slugify
diff --git a/docs/source/setup/index.rst b/docs/source/setup/index.rst
@@ -69,7 +69,7 @@ Configuration of Peeljobs
 		sudo apt install nodejs
 		npm install -g sass
 		pip install pipenv
-		pipenv install
+		pipenv install -d
 
 
 9. We used postgressql here open shell and create the following database
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -2,6 +2,6 @@
 ls /home/peeljobs
 pip3 install pipenv
 cd /home/peejobs
-pipenv install
+pipenv install -d
 python3 /home/peeljobs/manage.py migrate
 python3 /home/peeljobs/manage.py runserver
diff --git a/peeldb/migrations/0054_delete_googlefirend.py b/peeldb/migrations/0054_delete_googlefirend.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.19 on 2025-02-28 10:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peeldb", "0053_auto_20220412_0906"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="GoogleFirend",
+        ),
+    ]
diff --git a/peeldb/models.py b/peeldb/models.py
@@ -860,9 +860,6 @@ def get_user_twitter_friends(self):
     def get_user_twitter_followers(self):
         return TwitterFollower.objects.filter(user=self)
 
-    def get_user_google_friends(self):
-        return GoogleFirend.objects.filter(user=self)
-
     def get_open_tickets(self):
         return Ticket.objects.filter(
             Q(user=self) & Q(status="Open") | Q(status="Ongoing")
@@ -1179,15 +1176,6 @@ class TwitterFriend(models.Model):
     screen_name = models.CharField(max_length=100)
 
 
-class GoogleFirend(models.Model):
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    friend_id = models.CharField(max_length=200, default="")
-    fullname = models.CharField(max_length=200, default="")
-    title = models.CharField(max_length=200, default="")
-    email = models.CharField(max_length=2000, default="")
-    phone = models.CharField(max_length=200, default="")
-    familyname = models.CharField(max_length=200, default="")
-
 
 class FacebookFriend(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
diff --git a/pjob/views.py b/pjob/views.py
@@ -7,7 +7,7 @@
 import random
 
 from django.shortcuts import render, redirect
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.contrib.auth.decorators import login_required
 from django.conf import settings
 from django.utils import timezone
diff --git a/psite/views.py b/psite/views.py
@@ -4,7 +4,7 @@
 
 from django.shortcuts import render
 from django.contrib.auth import logout
-from django.http.response import HttpResponseRedirect, HttpResponse
+from django.http.response import HttpResponseRedirect, HttpResponse, JsonResponse
 from django.conf import settings
 from itertools import chain
 from django.template import loader
diff --git a/recruiter/tasks.py b/recruiter/tasks.py
@@ -10,7 +10,6 @@
     User,
     TwitterFollower,
     TwitterFriend,
-    GoogleFirend,
     FacebookFriend,
     FacebookPage,
     FacebookGroup,
@@ -38,52 +37,6 @@ def add_twitter_friends_followers(user_id, friends, followers):
         )
 
 
-@app.task()
-def add_google_friends(user_id, accesstoken):
-    user = User.objects.filter(id=user_id).first()
-    auth_token = gauth.OAuth2Token(
-        client_id=settings.GOOGLE_CLIENT_ID,
-        client_secret=settings.GOOGLE_CLIENT_SECRET,
-        scope="https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email "
-        + "https://www.googleapis.com/auth/contacts.readonly",
-        user_agent="dummy-sample",
-    )
-
-    auth_token.access_token = accesstoken
-    client1 = contacts.client.ContactsClient(source="")
-    client1 = auth_token.authorize(client1)
-    qry = contacts.client.ContactsQuery(max_results=3000)
-    feed = client1.get_contacts(query=qry)
-    print(feed.entry)
-    f1 = {}
-
-    for entry in feed.entry:
-        friend_id = entry.id.text
-        fullname = title = email = phone = familyname = ""
-        if entry.name is not None:
-            if entry.name.full_name is not None:
-                fullname = entry.name.full_name.text
-            if entry.name.family_name is not None:
-                familyname = entry.name.family_name.text
-
-        if entry.title is not None:
-            f1["title"] = entry.title.text
-        for email in entry.email:
-            f1["email"] = email.address
-        for phone in entry.phone_number:
-            f1["phone"] = phone.text
-
-        GoogleFirend.objects.create(
-            user=user,
-            friend_id=friend_id,
-            fullname=fullname,
-            title=title,
-            email=email,
-            phone=phone,
-            familyname=familyname,
-        )
-
-
 @app.task()
 def add_facebook_friends_pages_groups(accesstoken, fid, user):
     graph = GraphAPI(accesstoken)
diff --git a/recruiter/views.py b/recruiter/views.py
@@ -8,7 +8,7 @@
 import csv
 from collections import OrderedDict
 
-from django.http.response import HttpResponse, HttpResponseRedirect
+from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.shortcuts import render, get_object_or_404
 from django.conf import settings
 from twython.api import Twython
@@ -95,7 +95,6 @@
     del_jobpost_fb,
     del_jobpost_peel_fb,
     add_twitter_friends_followers,
-    add_google_friends,
     add_facebook_friends_pages_groups,
 )
 from mpcomp.views import (
@@ -2322,7 +2321,6 @@ def google_connect(request):
                     picture=picture,
                 )
 
-            # add_google_friends.delay(request.user.id, info["access_token"])
             return HttpResponseRedirect(reverse("recruiter:index"))
         message_type = "Sorry,"
         message = "We didnt find your Account"
diff --git a/social/tasks.py b/social/tasks.py
@@ -5,7 +5,6 @@
 from django.conf import settings
 from peeldb.models import (
     User,
-    GoogleFirend,
     FacebookFriend,
     FacebookPage,
     FacebookGroup,
@@ -126,52 +125,3 @@ def facebook_groups(accesstoken, user):
             user=user, group_id=group["id"], name=group["name"]
         )
 
-
-@app.task()
-def add_google_friends(user_id, accesstoken):
-    """
-    1. Getting the user object
-    2. Getting the gdata autok token by sending google app id, secret id
-    3. Retrieving the accesstoken
-    4. Getting the conacts object which returns 3000 objects maximum
-    4. Creating google friends list with the xml page response
-    """
-
-    user = User.objects.filter(id=user_id).first()
-    auth_token = gauth.OAuth2Token(
-        client_id=settings.GOOGLE_CLIENT_ID,
-        client_secret=settings.GOOGLE_CLIENT_SECRET,
-        scope="https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email "
-        + "https://www.googleapis.com/auth/contacts.readonly ",
-        user_agent="dummy-sample",
-    )
-
-    auth_token.access_token = accesstoken
-    client1 = contacts.ContactsClient(source="")
-    client1 = auth_token.authorize(client1)
-    qry = contacts.ContactsQuery(max_results=3000)
-    feed = client1.get_contacts(query=qry)
-    for each in [feed]:
-        each_feed = [each][0]
-        friend_id = each_feed.id.text
-        entry = [each][0].entry
-        for each_entry in [entry]:
-            for entry in each_entry:
-                fullname = email = familyname = ""
-                if entry.name is not None:
-                    if entry.name.full_name is not None:
-                        fullname = entry.name.full_name.text
-                    if entry.name.family_name is not None:
-                        familyname = entry.name.family_name.text
-                if entry.email:
-                    email = entry.email[0].address
-                    if not GoogleFirend.objects.filter(user=user, email=email):
-                        GoogleFirend.objects.create(
-                            user=user,
-                            friend_id=friend_id,
-                            fullname=fullname,
-                            title="",
-                            email=email,
-                            phone="",
-                            familyname=familyname,
-                        )
diff --git a/social/views.py b/social/views.py
@@ -46,7 +46,6 @@
     facebook_groups,
     facebook_friends,
     facebook_pages,
-    add_google_friends,
     add_twitter_friends_followers,
 )
 
@@ -361,15 +360,13 @@ def google_login(request):
             user.save()
             login(request, user, backend="django.contrib.auth.backends.ModelBackend")
             # gpinfo.delay(id_value,user_document,picture,gender,dob,link,"login")
-            # add_google_friends.delay(request.user.id, info["access_token"])
             return HttpResponseRedirect("/social/user/update/")
 
         # user.last_login = datetime.now()
         user.save()
         # login(request, user)
         login(request, user, backend="django.contrib.auth.backends.ModelBackend")
         # gpinfo.delay(id_value,user_document,picture,gender,dob,link,"login")
-        # add_google_friends.delay(request.user.id, info["access_token"])
         if request.session.get("job_event"):
             return HttpResponseRedirect(reverse("pjob:job_add_event"))
         # if request.is_mobile == "mobile":
@@ -980,7 +977,6 @@ def google_connect(request):
             UserEmail.objects.create(user=request.user, email=user_document["email"])
 
         # gpinfo.delay(id_value,user_document,picture,gender,dob,link,"login")
-        # add_google_friends.delay(request.user.id, info["access_token"])
         return HttpResponseRedirect(reverse("my:profile"))
     else:
         rty = (
diff --git a/templates/dashboard/recruiters/view.html b/templates/dashboard/recruiters/view.html
@@ -382,28 +382,6 @@ <h4><i class="fa fa-list-ul"></i>User Details</h4>
       </div>
       <!--/ twit pages -->
 
-
-      <!-- gplus friends  -->
-      <div class="tab_content"  id='gplus_friends'>
-      {% if recruiter.get_user_google_friends %}
-        {% for friend in recruiter.get_user_google_friends %}
-        <div class='specific_detail'>
-          <div class="left_div">
-            <div class="tile_each">
-              <label>First Name</label>
-              <span class="description">
-              <a href="{{ friend.friend_id }}" class="gp_friends"><span>{{ friend.fullname }}</span></a>
-              </span>
-              <div class="clearfix"></div>
-            </div>
-          </div>
-          <div class="clearfix"></div>
-        </div>
-        {% endfor %}
-        {% else %}
-          User not connected to G+
-        {% endif %}
-      </div>
       {% if recruiter.get_active_jobposts_count >= 100 %}
       <div class="tab_content"  id='bank_details'>
         <div class='specific_detail'>
diff --git a/tickets/views.py b/tickets/views.py
