Pruebas lizseth

.gitignore

@@ -52,7 +52,7 @@ coverage.xml
 
 # Django stuff:
 *.log
-local_settings.py
+#local_settings.py
 
 # Flask stuff:
 instance/

.travis.yml

@@ -1,21 +1,28 @@
-dist: xenial
-
-services:
-  - postgresql
-addons:
-  postgresql: "9.4"
-before_script:
-  - psql -U postgres -c "create user decide password 'decide'"
-  - psql -U postgres -c "create database test_decide owner decide"
-  - psql -U postgres -c "ALTER USER decide CREATEDB"
 language: python
 python:
-  - "3.6"
+- '3.6'
+branches:
+  only:
+  - master
+  - develop
+services:
+- postgresql
+env:
+- DJANGO=2.0 DB=postgres
+global:
+- PGPORT=5432
+before_install:
+- cd decide
 install:
-  - pip install -r requirements.txt
-  - pip install codacy-coverage
+- pip install -r ../requirements.txt
+before_script:
+- cp local_settings.travis.py local_settings.py
+- psql -U postgres -c "create user decide password 'decide'" 
+- psql -U postgres -c "create database test_decide owner decide" 
+- psql -U postgres -c "ALTER USER decide CREATEDB"
+- python manage.py makemigrations
+- python manage.py migrate
 script:
-  - cd decide
-  - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit
-  - coverage xml
-  - python-codacy-coverage -r coverage.xml
+- python manage.py test
+addons:
+  postgresql: '9.6'

Procfile

@@ -0,0 +1,4 @@
+% prepara el repositorio para su despliegue. 
+release: sh -c 'cd decide && python manage.py migrate'
+% especifica el comando para lanzar Decide
+web: sh -c 'cd decide && gunicorn decide.wsgi --log-file -'

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
+[![Build Status](https://travis-ci.com/RioTinto-Votaciones/decide.svg?branch=develop)](https://travis-ci.com/RioTinto-Votaciones/decide)
 
 Plataforma voto electrónico educativa pro
 =====================================

decide/base/migrations/0001_initial.py

@@ -1,5 +1,6 @@
-# Generated by Django 2.0 on 2018-06-05 08:42
+# Generated by Django 2.0 on 2021-01-17 21:48
 
+import base.models
 from django.db import migrations, models
 
 
@@ -24,10 +25,10 @@ class Migration(migrations.Migration):
             name='Key',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('p', models.IntegerField()),
-                ('g', models.IntegerField()),
-                ('y', models.IntegerField()),
-                ('x', models.IntegerField(blank=True, null=True)),
+                ('p', base.models.BigBigField()),
+                ('g', base.models.BigBigField()),
+                ('y', base.models.BigBigField()),
+                ('x', base.models.BigBigField(blank=True, null=True)),
             ],
         ),
     ]

decide/base/tests.py

@@ -20,6 +20,10 @@ def setUp(self):
         user_admin.set_password('qwerty')
         user_admin.save()
 
+        user_admin = User(username='admin-selenium', is_staff=True, is_superuser=True, is_active=True)
+        user_admin.set_password('qwerty')
+        user_admin.save()
+
     def tearDown(self):
         self.client = None
         self.token = None

decide/census/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0 on 2018-04-08 17:16
+# Generated by Django 2.0 on 2021-01-17 21:48
 
 from django.db import migrations, models
 

decide/decide/settings.py

@@ -70,7 +70,7 @@
     'voting',
 ]
 
-BASEURL = 'http://localhost:8000'
+BASEURL = 'https://votacionegc.herokuapp.com/'
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
@@ -161,6 +161,8 @@
 # number of bits for the key, all auths should use the same number of bits
 KEYBITS = 256
 
+APIS = {}
+
 # Versioning
 ALLOWED_VERSIONS = ['v1', 'v2']
 DEFAULT_VERSION = 'v1'
@@ -180,3 +182,6 @@
 
 
 INSTALLED_APPS = INSTALLED_APPS + MODULES
+
+# import django_heroku
+# django_heroku.settings(locals())

decide/local_settings.py

@@ -0,0 +1,45 @@
+ALLOWED_HOSTS = ["*"]
+
+# Modules in use, commented modules that you won't use
+MODULES = [
+	'authentication',
+	'base',
+	'booth',
+	'census',
+	'mixnet',
+	'postproc',
+	'store',
+	'visualizer',
+	'voting',
+]
+
+APIS = {
+	'authentication': 'http://localhost:8000',
+	'base': 'http://localhost:8000',
+	'booth': 'http://localhost:8000',
+	'census': 'http://localhost:8000',
+	'mixnet': 'http://localhost:8000',
+	'postproc': 'http://localhost:8000',
+	'store': 'http://localhost:8000',
+	'visualizer': 'http://localhost:8000',
+	'voting': 'http://localhost:8000',
+}
+
+BASEURL = 'http://localhost:8000'
+
+DATABASES = {
+	'default': {
+    	'ENGINE': 'django.db.backends.postgresql',
+    	'NAME': 'decide',
+    	'USER': 'decide',
+    	'PASSWORD': 'decide',
+    	'HOST': 'localhost',
+    	'PORT': '5432',
+	}
+}
+
+# number of bits for the key, all auths should use the same number of bits
+KEYBITS = 256
+
+STATIC_URL = '/static/'
+

decide/local_settings.travis.py

@@ -0,0 +1,41 @@
+ALLOWED_HOSTS = ["*"]
+
+# Modules in use, commented modules that you won't use
+MODULES = [
+    'authentication',
+    'base',
+    'booth',
+    'census',
+    'mixnet',
+    'postproc',
+    'store',
+    'visualizer',
+    'voting',
+]
+
+APIS = {
+    'authentication': 'http://localhost:8000',
+    'base': 'http://localhost:8000',
+    'booth': 'http://localhost:8000',
+    'census': 'http://localhost:8000',
+    'mixnet': 'http://localhost:8000',
+    'postproc': 'http://localhost:8000',
+    'store': 'http://localhost:8000',
+    'visualizer': 'http://localhost:8000',
+    'voting': 'http://localhost:8000',
+}
+
+BASEURL = 'http://localhost:8000'
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'postgres',
+        'USER': 'postgres',
+        'HOST': 'localhost',
+        'PORT': '5432',
+    }
+}
+
+# number of bits for the key, all auths should use the same number of bits
+KEYBITS = 256

decide/mixnet/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0 on 2018-02-16 11:26
+# Generated by Django 2.0 on 2021-01-17 21:48
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,36 +9,19 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('base', '0001_initial'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Auth',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200)),
-                ('url', models.URLField()),
-                ('me', models.BooleanField(default=False)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Key',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('p', models.IntegerField()),
-                ('g', models.IntegerField()),
-                ('y', models.IntegerField()),
-                ('x', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
         migrations.CreateModel(
             name='Mixnet',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('vote_id', models.PositiveIntegerField()),
-                ('auths', models.ManyToManyField(related_name='mixnets', to='mixnet.Auth')),
-                ('key', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mixnets', to='mixnet.Key')),
-                ('pubkey', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mixnets_pub', to='mixnet.Key')),
+                ('voting_id', models.PositiveIntegerField()),
+                ('auth_position', models.PositiveIntegerField(default=0)),
+                ('auths', models.ManyToManyField(related_name='mixnets', to='base.Auth')),
+                ('key', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mixnets', to='base.Key')),
+                ('pubkey', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mixnets_pub', to='base.Key')),
             ],
         ),
     ]