fix merge conflicts

Author: diwash007

.gitignore

@@ -2,7 +2,9 @@
 # $GIT_DIR/info/exclude or the core.excludesFile configuration variable as
 # described in https://git-scm.com/docs/gitignore
 settings_local.py
-credentials.json
+Pipfile
+Pipfile.lock
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -21,5 +23,5 @@ logs/*
 .vscode
 
 # Google Calendar creds
-scripts/credentials.json
-google_api_token.pickle
+credentials.json
+token.json

aldryn_newsblog/views.py

@@ -243,13 +243,16 @@ def get_queryset(self):
         qs = super(ArticleList, self).get_queryset()
         # exclude featured articles from queryset, to allow featured article
         # plugin on the list view page without duplicate entries in page qs.
-        exclude_count = self.config.exclude_featured
-        if exclude_count:
-            featured_qs = Article.objects.all().filter(is_featured=True)
-            if not self.edit_mode:
-                featured_qs = featured_qs.published()
-            exclude_featured = featured_qs[:exclude_count].values_list('pk')
-            qs = qs.exclude(pk__in=exclude_featured)
+        try:
+            exclude_count = self.config.exclude_featured
+            if exclude_count:
+                featured_qs = Article.objects.all().filter(is_featured=True)
+                if not self.edit_mode:
+                    featured_qs = featured_qs.published()
+                exclude_featured = featured_qs[:exclude_count].values_list('pk')
+                qs = qs.exclude(pk__in=exclude_featured)
+        except Exception:
+            pass
         return qs
 
 

blogs_list/feeds.py

@@ -146,7 +146,7 @@ def get_object(self, request):
             articles = list(articles_all[start_index:end_index])
             return articles
         else:
-            raise ObjectDoesNotExist
+            return []
 
     def feed_extra_kwargs(self, obj):
         return {

docs/README.md

@@ -36,6 +36,16 @@ Default student users are `student-1`, `student-2`, `student-3` and `student-4`
 ## Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 
+## Google OAuth
+- Go to https://console.cloud.google.com/ and create a new project
+- Enable Google Calendar API and create an OAuth 2.0 client ID
+- add following on the Authorised redirect URIs of OAuth client ID
+```bash
+http://localhost/
+```
+- Download the JSON file and rename it to `credentials.json`
+- Move the file to the root folder of the project
+
 ## Virtualenv
 
 A virtual environment is a tool that helps to keep dependencies required by different projects separate by creating isolated python virtual environments for them. This means that each project can have its own dependencies, regardless of what dependencies every other project has. We use a module named `virtualenv` which is a tool to create isolated Python environments. `virtualenv` creates a folder which contains all the necessary executables to use the packages that a Python project would need.

gsoc/forms.py

@@ -1,3 +1,4 @@
+import re
 from PIL import Image
 
 from .models import (
@@ -51,7 +52,7 @@ class Meta:
 class BlogPostDueDateForm(forms.ModelForm):
     class Meta:
         model = BlogPostDueDate
-        fields = ("title", "date", "category")
+        fields = ("category", "date", "title")
 
 
 class EventForm(forms.ModelForm):
@@ -121,8 +122,12 @@ def clean(self):
 
         if not suborg and suborg_name:
             suborg = SubOrg.objects.filter(suborg_name=suborg_name)
-            if len(suborg) > 0:
+            if suborg:
                 cd["suborg"] = suborg.first()
+            else:
+                regex = r'^[ a-zA-Z\-]*$'
+                if not re.match(regex, suborg_name):
+                    raise ValidationError("Invalid suborg name.")
         elif suborg and not suborg_name:
             cd["suborg_name"] = suborg.suborg_name
         elif suborg and suborg_name:

gsoc/management/commands/googleapiauth.py

@@ -3,7 +3,6 @@
 import datetime
 import uuid
 import json
-import pickle
 import bleach
 from urllib.parse import urljoin
 
@@ -43,6 +42,11 @@
 from gsoc.settings import PROPOSALS_PATH, BASE_DIR
 from settings_local import ADMINS
 
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+
+SCOPES = ['https://www.googleapis.com/auth/calendar']
 
 # Util Functions
 
@@ -51,6 +55,27 @@ def gen_uuid_str():
     return str(uuid.uuid4())
 
 
+def getCreds():
+    creds = None
+    if os.path.exists(os.path.join(BASE_DIR, 'token.json')):
+        creds = Credentials.from_authorized_user_file(
+            os.path.join(BASE_DIR, 'token.json'),
+            SCOPES
+        )
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                os.path.join(BASE_DIR, 'credentials.json'),
+                SCOPES
+            )
+            creds = flow.run_local_server(port=0)
+        with open(os.path.join(BASE_DIR, 'token.json'), 'w') as token:
+            token.write(creds.to_json())
+    return creds
+
+
 # Patching
 
 NewsBlogConfig.__str__ = lambda self: self.app_title
@@ -559,14 +584,12 @@ class Timeline(models.Model):
 
     def add_calendar(self):
         if not self.calendar_id:
-            tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-            with open(tpath, "rb") as token:
-                creds = pickle.load(token)
-                service = build("calendar", "v3", credentials=creds)
-                calendar = {"summary": "GSoC @ PSF Calendar", "timezone": "UTC"}
-                calendar = service.calendars().insert(body=calendar).execute()
-                self.calendar_id = calendar.get("id")
-                self.save()
+            creds = getCreds()
+            service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+            calendar = {"summary": "GSoC @ PSF Calendar", "timezone": "UTC"}
+            calendar = service.calendars().insert(body=calendar).execute()
+            self.calendar_id = calendar.get("id")
+            self.save()
 
 
 class Builder(models.Model):
@@ -602,51 +625,45 @@ class Event(models.Model):
     @property
     def calendar_link(self):
         if self.event_id:
-            tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-            with open(tpath, "rb") as token:
-                creds = pickle.load(token)
-                service = build("calendar", "v3", credentials=creds)
-                event = (
-                    service.events()
-                    .get(calendarId=self.timeline.calendar_id, eventId=self.event_id)
-                    .execute()
-                )
-                return event.get("htmlLink", None)
+            creds = getCreds()
+            service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+            event = (
+                service.events()
+                .get(calendarId=self.timeline.calendar_id, eventId=self.event_id)
+                .execute()
+            )
+            return event.get("htmlLink", None)
         return None
 
     def add_to_calendar(self):
-        tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-        with open(tpath, "rb") as token:
-            creds = pickle.load(token)
-            service = build("calendar", "v3", credentials=creds)
-            event = {
-                "summary": self.title,
-                "start": {"date": self.start_date.strftime("%Y-%m-%d")},
-                "end": {"date": self.end_date.strftime("%Y-%m-%d")},
-            }
-            cal_id = self.timeline.calendar_id if self.timeline else "primary"
-            if not self.event_id:
-                event = (
-                    service.events()
-                    .insert(calendarId=cal_id, body=event)
-                    .execute()
-                )
-                self.event_id = event.get("id")
-                self.save()
-            else:
-                service.events().update(
-                    calendarId=cal_id, eventId=self.event_id, body=event
-                ).execute()
+        creds = getCreds()
+        service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+        event = {
+            "summary": self.title,
+            "start": {"date": self.start_date.strftime("%Y-%m-%d")},
+            "end": {"date": self.end_date.strftime("%Y-%m-%d")},
+        }
+        cal_id = self.timeline.calendar_id if self.timeline else "primary"
+        if not self.event_id:
+            event = (
+                service.events()
+                .insert(calendarId=cal_id, body=event)
+                .execute()
+            )
+            self.event_id = event.get("id")
+            self.save()
+        else:
+            service.events().update(
+                calendarId=cal_id, eventId=self.event_id, body=event
+            ).execute()
 
     def delete_from_calendar(self):
         if self.event_id:
-            tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-            with open(tpath, "rb") as token:
-                creds = pickle.load(token)
-                service = build("calendar", "v3", credentials=creds)
-                service.events().delete(
-                    calendarId=self.timeline.calendar_id, eventId=self.event_id
-                ).execute()
+            creds = getCreds()
+            service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+            service.events().delete(
+                calendarId=self.timeline.calendar_id, eventId=self.event_id
+            ).execute()
 
     def save(self, *args, **kwargs):
         if not self.end_date:
@@ -666,7 +683,7 @@ class BlogPostDueDate(models.Model):
     class Meta:
         ordering = ["date"]
 
-    title = models.CharField(max_length=100, default="Weekly Blog Post Due")
+    title = models.CharField(max_length=100, default="Loading...")
     date = models.DateField()
     timeline = models.ForeignKey(
         Timeline,
@@ -692,38 +709,34 @@ class Meta:
     category = models.IntegerField(choices=categories, null=True, blank=True)
 
     def add_to_calendar(self):
-        tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-        with open(tpath, "rb") as token:
-            creds = pickle.load(token)
-            service = build("calendar", "v3", credentials=creds)
-            event = {
-                "summary": self.title,
-                "start": {"date": self.date.strftime("%Y-%m-%d")},
-                "end": {"date": self.date.strftime("%Y-%m-%d")},
-            }
-            cal_id = self.timeline.calendar_id if self.timeline else "primary"
-            if not self.event_id:
-                event = (
-                    service.events()
-                    .insert(calendarId=cal_id, body=event)
-                    .execute()
-                )
-                self.event_id = event.get("id")
-                self.save()
-            else:
-                service.events().update(
-                    calendarId=cal_id, eventId=self.event_id, body=event
-                ).execute()
+        creds = getCreds()
+        service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+        event = {
+            "summary": self.title,
+            "start": {"date": self.date.strftime("%Y-%m-%d")},
+            "end": {"date": self.date.strftime("%Y-%m-%d")},
+        }
+        cal_id = self.timeline.calendar_id if self.timeline else "primary"
+        if not self.event_id:
+            event = (
+                service.events()
+                .insert(calendarId=cal_id, body=event)
+                .execute()
+            )
+            self.event_id = event.get("id")
+            self.save()
+        else:
+            service.events().update(
+                calendarId=cal_id, eventId=self.event_id, body=event
+            ).execute()
 
     def delete_from_calendar(self):
         if self.event_id:
-            tpath = os.path.join(BASE_DIR, "google_api_token.pickle")
-            with open(tpath, "rb") as token:
-                creds = pickle.load(token)
-                service = build("calendar", "v3", credentials=creds)
-                service.events().delete(
-                    calendarId=self.timeline.calendar_id, eventId=self.event_id
-                ).execute()
+            creds = getCreds()
+            service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+            service.events().delete(
+                calendarId=self.timeline.calendar_id, eventId=self.event_id
+            ).execute()
 
     def create_scheduler(self):
         if not BLOG_POST_DUE_REMINDER.disabled:
@@ -794,6 +807,18 @@ def save(self, *args, **kwargs):
             post2.save()
         except Exception:
             pass
+
+        # update title
+        gsoc_year = GsocYear.objects.latest('gsoc_year')
+        timeline = Timeline.objects.get(gsoc_year=gsoc_year)
+        items = BlogPostDueDate.objects.filter(timeline=timeline)
+        if self.category == 0:
+            num = sum([1 for item in items if "Weekly Check-in Due" in item.title])
+            self.title = f"Weekly Check-in Due {num}"
+        else:
+            num = sum([1 for item in items if "Weekly Blog Post Due" in item.title])
+            self.title = f"Weekly Blog Post Due {num}"
+
         super(BlogPostDueDate, self).save(*args, **kwargs)
 
 
@@ -1530,3 +1555,23 @@ def add_review(sender, instance, **kwargs):
 @receiver(models.signals.post_save, sender=Article)
 def add_history(sender, instance, **kwargs):
     BlogPostHistory.objects.create(article=instance, content=instance.lead_in)
+
+
+# Delete add_blog_counter scheduler when BlopPostDueDate object is deleted
+@receiver(models.signals.post_delete, sender=BlogPostDueDate)
+def delete_add_blog_counter_scheduler(sender, instance, **kwargs):
+    try:
+        Scheduler.objects.get(id=instance.add_counter_scheduler.id).delete()
+    except Scheduler.DoesNotExist:
+        pass
+
+
+# Update add_blog_counter scheduler when BlopPostDueDate object is changed
+@receiver(models.signals.post_save, sender=BlogPostDueDate)
+def update_add_blog_counter_scheduler(sender, instance, **kwargs):
+    try:
+        scheduler = Scheduler.objects.get(id=instance.add_counter_scheduler.id)
+        scheduler.activation_date = instance.date + datetime.timedelta(days=-6)
+        scheduler.save()
+    except Scheduler.DoesNotExist:
+        pass