Skip to content

Commit

Permalink
Eliminando dependencias de votainteligente y pasandolo a un votai_utils
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe Álvarez committed Mar 9, 2018
1 parent f07394f commit 15bcd3a
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 194 deletions.
2 changes: 1 addition & 1 deletion backend_candidate/tasks.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from votainteligente.celery import app
from votai_utils.celery import app
from elections.models import Candidate
from backend_candidate.models import send_candidate_a_candidacy_link
from backend_candidate.send_mails_to_candidates import send_user_to_candidates, send_candidate_username_and_password
Expand Down
4 changes: 2 additions & 2 deletions elections/migrations/0027_auto_20160818_1538.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from django.db import migrations, models
import django.db.models.deletion
import votainteligente.open_graph
import votai_utils.open_graph


class Migration(migrations.Migration):
Expand All @@ -21,7 +21,7 @@ class Migration(migrations.Migration):
options={
'proxy': True,
},
bases=('popolo.area', votainteligente.open_graph.OGPMixin),
bases=('popolo.area', votai_utils.open_graph.OGPMixin),
),
migrations.AlterField(
model_name='election',
Expand Down
2 changes: 1 addition & 1 deletion elections/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.views.generic.base import TemplateView
from elections.models import Election, Area
from elections.models import Candidate, QuestionCategory, CandidateFlatPage
from votainteligente.views import HomeViewBase
from votai_utils.views import HomeViewBase
import logging
from backend_citizen.forms import GroupCreationForm
from candidator.models import Topic, TakenPosition
Expand Down
23 changes: 0 additions & 23 deletions popular_proposal/tests/facebook_page_getter_tests.py

This file was deleted.

121 changes: 13 additions & 108 deletions popular_proposal/tests/fixtures/vcr_cassettes/circoroto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,121 +5,26 @@ interactions:
Accept: ['*/*']
Accept-Encoding: ['gzip, deflate']
Connection: [keep-alive]
User-Agent: [python-requests/2.9.1]
User-Agent: [python-requests/2.18.4]
method: GET
uri: https://graph.facebook.com/v2.5/https://www.facebook.com/circoroto?fields=about%2Cpicture%2Cevents%2Cname&access_token=FieraEsLaMejorAmigaDeTodos
response:
body:
string: !!binary |
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
eapD9PFs6a6nYYTwvNb3/wDetOrrCxAAAA==
body: {string: !!python/unicode '{"error":{"message":"Invalid OAuth access token
data.","type":"OAuthException","code":190,"fbtrace_id":"DFqsZkikkfV"}}'}
headers:
access-control-allow-origin: ['*']
cache-control: ['private, no-cache, no-store, must-revalidate']
cache-control: [no-store]
connection: [keep-alive]
content-encoding: [gzip]
content-length: ['2134']
content-length: ['118']
content-type: [application/json; charset=UTF-8]
date: ['Tue, 26 Apr 2016 21:32:32 GMT']
etag: ['"42578e135343857a3c48275ee5e3e5dd7aae0b09"']
date: ['Fri, 09 Mar 2018 17:53:56 GMT']
expires: ['Sat, 01 Jan 2000 00:00:00 GMT']
facebook-api-version: [v2.5]
pragma: [no-cache]
vary: [Accept-Encoding]
x-fb-debug: [o46Je9SWIehRMS4QVskrDDQLmJh6+20v/NiVOU0T10gBRKzX8sen7pjbVMIS//Wt1LjwvVX7xP9s1tf5NOeTsg==]
x-fb-rev: ['2305412']
x-fb-trace-id: [Bb5NJZ9XU7k]
status: {code: 200, message: OK}
- request:
body: null
headers:
Accept: ['*/*']
Accept-Encoding: ['gzip, deflate']
Connection: [keep-alive]
User-Agent: [python-requests/2.9.1]
method: GET
uri: https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xla1/v/t1.0-1/p50x50/12311286_1645199725722711_2302142612215409381_n.jpg?oh=c930eb302339ae80a6ef5376ae9dfdf8&oe=57A9026F&__gda__=1472097405_e2bde52740c8fae2cdb41f175a6350ff
response:
body:
string: !!binary |
/9j/4AAQSkZJRgABAgAAAQABAAD/7QCcUGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAIAcAmcAFFRo
OHFSTmNfaVhQdDFuZXRWalhXHAIoAGJGQk1EMDEwMDBhOTcwMTAwMDBmYTAxMDAwMDk0MDIwMDAw
YjUwMjAwMDBmMTAyMDAwMDY5MDQwMDAwNjYwNTAwMDA5NjA1MDAwMGI3MDUwMDAwZTYwNTAwMDA0
MjA3MDAwMP/bAEMABgQFBgUEBgYFBgcHBggKEAoKCQkKFA4PDBAXFBgYFxQWFhodJR8aGyMcFhYg
LCAjJicpKikZHy0wLSgwJSgpKP/bAEMBBwcHCggKEwoKEygaFhooKCgoKCgoKCgoKCgoKCgoKCgo
KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKP/CABEIADIAMgMAIgABEQECEQH/xAAaAAEA
AwEBAQAAAAAAAAAAAAAABQYHBAII/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQBAQAAAAAAAAAA
AAAAAAAAAAD/2gAMAwAAARECEQAAAdUV7FzbKZS/ZZdc+fdlJ0FHoerY0XmDko85LHU5E2cHNgH0
RlZ2V/gmyCkbncz0AAAAD//EACAQAAICAgICAwAAAAAAAAAAAAMEAgUBBgAUEBMREjD/2gAIAQAA
AQUC8M2yK3HtkjPItpLg3i6ssVq53HbAha6R3ZVocRMqvKNEfsVPNwF7KjDJEaxIH0rehgvO4ktP
UG/gPLkR2FEDRYERg4grhDJLCasp6dmM3uMh94XY5r7tn1TsYNIJZLYdXGoqn7/jba0xmTpPWDa2
qm4lr6wRRjiEfw//xAAUEQEAAAAAAAAAAAAAAAAAAABA/9oACAECEQE/AQf/xAAUEQEAAAAAAAAA
AAAAAAAAAABA/9oACAEBEQE/AQf/xAAvEAACAQMBBQYFBQAAAAAAAAABAgMAERIEEBMhMUEiIzJC
UWEFFHGBwRUwQ1Ox/9oACAEAAAY/AtnealL+i8TVtGzIAOJZRx+n+0iPHGYwbM/U++0OVyLGwp3k
30sSnJkW+IFSro1AjxEqgt5TTuutQw8kfHxNa9vamhhV11EcYkyJuJOFz9K0z9ccT9uGzP8ArcN+
K+HHS85DIzDox8NaHW8pILxyg9UyII+1S/DVYCWDUZgE2yjNS3V5NRAGhiccnXkL18qQDxLZX5e2
xoYVRlcHO54/al0EsUj9u8JjPaU1qxOmcGsuse6bOz2tatV+qLLJq070jzYjh4vSk0WDjVNHmJsu
BON7W9KZJBliuSX8p2NGWdAeqGxprfxSBl+nSvloO7mgk3u6J4TZcTY+taeKKWSaI5iXIeFWFrUY
oN1qDGuEeqxsVB6UuoC9zYgnbHqNNE0lxiwUXq+oi3epcDEHs3A5/isp547jygXvUW8F5BxcXure
1WUAD0H7P//EACUQAQACAgEDBAIDAAAAAAAAAAERIQAxQRBRYXGBobEg4cHR8f/aAAgBAAABPyHG
i8niL5viMPL9zDActS+zA9tNMGkfeCJJY9KJjfnO4EwD1WvXC9/UCK73E36ZHMItBfu9P5MoBjSY
19g14MkdmH1P0dKQX7U/tm8zUTIhJzBk3DBPtQHqnLobpQmvIA4gHp8mSnmDFcZByEoO4WHmnU9B
JkUgcerLPaKjNl0jHjDDEhy3jyxfkxyiiBGphbt8YSjHeeH407nDvdz4GGO2+gb3H5Bh3SUQHB08
ZGrNiPEk4IrH+4t76qiL2pNdvObgIzFfSUM0mJh3P7Ou+7awmmPf4wtQJoCt7fbDUNgwrstVjSqi
9h2JqcKHeggPwi55/H//2gAMAwAAARECEQAAELICPPFIPGLGPPHPPP/EABQRAQAAAAAAAAAAAAAA
AAAAAED/2gAIAQIRAT8QB//EABQRAQAAAAAAAAAAAAAAAAAAAED/2gAIAQERAT8QB//EACIQAQEA
AgICAQUBAAAAAAAAAAERACExQRBRYSBxgZHBof/aAAgBAAABPxDEIoAKr1iHdWGfTWP3mSyR8aqp
QnYC6JMSVSE95IBThJ1hJQFEaJ4T0pGyC7+Pz/cWOifklTDBKLq5wCSbdgVQN25XfIhZbooGwACt
ROVZuqVqBGpSGFFR2mJI9jtdS/Lt+fDopSJ1Rf6f1g5FhicAJS6HtGZsNXoUCu6EZwnrGNUbsmrR
rB8OrMWNuOVxmrUIg9EYcQjSggKlOi7DnxYChgpYxKTl41p61PSpr6cotYRfU1fzd+Lksijshtwf
GT0ISj2AYdaYgfc2G1EsZL2SaxlyppAKF0ke+deJYZIqCMIdMidimPnZBaHSAciw3vCINbQ1L1oO
jUhQsuqSZRIwvYVJwygarFSgWWkeCzWs1Jo+KIE96hOT152Cv09qAsSL/ZiSTttMUamnLvhxiIQp
unCtFwwX1ig49FFFElUQHW2KYc/4H9gGvoiIIIM2fT//2Q==
headers:
access-control-allow-origin: ['*']
cache-control: ['no-transform, max-age=1209600']
connection: [keep-alive]
content-length: ['1858']
content-type: [image/jpeg]
date: ['Tue, 26 Apr 2016 21:32:33 GMT']
expires: ['Tue, 10 May 2016 21:32:33 GMT']
last-modified: ['Wed, 09 Dec 2015 18:45:06 GMT']
timing-allow-origin: ['*']
status: {code: 200, message: OK}
strict-transport-security: [max-age=15552000; preload]
www-authenticate: [OAuth "Facebook Platform" "invalid_token" "Invalid OAuth
access token data."]
x-fb-debug: [FORleMmNU+HGABLC08BrFaFAF20iqjfHA0D1D8V3QBPgA/BTambK3XRlazlEzv0ZuYBHDT4HUGSBuwfGJfeJ2Q==]
x-fb-rev: ['3709588']
x-fb-trace-id: [DFqsZkikkfV]
status: {code: 400, message: Bad Request}
version: 1
2 changes: 1 addition & 1 deletion popular_proposal/views/proposal_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
ProposalLike,
ProposalTemporaryData,)

from votainteligente.view_mixins import EmbeddedViewBase
from votai_utils.view_mixins import EmbeddedViewBase
import random
from django.conf import settings

Expand Down
2 changes: 1 addition & 1 deletion preguntales/tasks.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from votainteligente.celery import app
from votai_utils.celery import app
from preguntales.models import Message

# import the logging library
Expand Down
2 changes: 1 addition & 1 deletion proposal_subscriptions/tasks.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from votainteligente.celery import app
from votai_utils.celery import app
from proposal_subscriptions.runner import TaskRunner
from proposal_subscriptions.models import CommitmentNotificationSender
# import the logging library
Expand Down
File renamed without changes.
File renamed without changes.
16 changes: 12 additions & 4 deletions votai_utils/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.views.generic import TemplateView
from django.dispatch import receiver
from registration.signals import user_activated
from django.contrib.auth import login

from django.shortcuts import render

# Create your views here.
@receiver(user_activated)
def post_activated_user(sender, user, request, **kwargs):
user.backend = 'django.contrib.auth.backends.ModelBackend'
login(request, user)


class HomeViewBase(TemplateView):
template_name = 'index.html'
2 changes: 1 addition & 1 deletion votainteligente/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from __future__ import absolute_import

from .celery import app as celery_app
from votai_utils.celery import app as celery_app
36 changes: 0 additions & 36 deletions votainteligente/facebook_page_getter.py

This file was deleted.

14 changes: 0 additions & 14 deletions votainteligente/views.py

This file was deleted.

2 changes: 1 addition & 1 deletion votita/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic.list import ListView
from django.conf import settings
from votainteligente.views import HomeViewBase
from votai_utils.views import HomeViewBase
from django.db.models import Count


Expand Down

0 comments on commit 15bcd3a

Please sign in to comment.