Contacts for real (#326)

* Added Contact model for lookups

* Changed custom command to work with contacts

* Modified form to have the contacts table be the lookup

* using guid for tags

* I think its working, trying vagrant destroy

* fixing the vagrant. closes #315

* Contacts without emails dont get in.

Saving projects works and does what we want

* about to refactor with q

* its a lot faster now

* about to refactor push_data

* push queue working

* fixed user person correlation and user updates

* Revert "push queue working"

This reverts commit 57ca9c4.

* Fixing minor bug

* fix unit test

* Code review comments

* Fixed some performance bugs

* contacts made when people change their info

* Address code review cleanup

* Fixed regression that added everyone to your project

* removed contact from registry models

* associate isntantiated person with user

* take to about you first time

Author: PFWhite

.gitignore

@@ -94,4 +94,9 @@ ENV/
 .swp
 
 # django fixture tests
-fixtures/test*
+fixtures/test*
+
+# collectstatic
+qipr_approver/static/admin/*
+qipr_approver/static/debug_toolbar/*
+test_contact.csv

qipr_approver/approver/api/tags.py

@@ -54,7 +54,6 @@ def get_data(display, model_props, model_name):
     for index, item in enumerate(display):
         data.append({
             'display': display[index],
-            'tag_prop': model_props[index]['tag'],
             'model_name': model_name,
             'guid': model_props[index]['guid']
         })

qipr_approver/approver/bridge/push_data.py

@@ -9,19 +9,32 @@
 import approver.models
 from approver.constants import registry_endpoints, api_username, bridge_key
 
+def load_api_user():
+    API_user = None
+    def get_api_user():
+        nonlocal API_user
+        if not API_user:
+            API_user = User.objects.get(username=api_username)
+        return API_user
+
+    return get_api_user
+
+get_api_user = load_api_user()
+
 def push_model(model):
-    api_user = User.objects.get(username=api_username)
-    json_data, req_hash = process_data(model)
-    response = None
-    url = '/'.join([registry_endpoints.get('add_model'), req_hash])
-    try:
-        response = requests.post(url, data=json_data)
-        if response.status_code == 200 and not model.is_registered():
-            model.register()
-            model.save(api_user)
-    except requests.exceptions.RequestException as e:
-        print(e)
-    return response
+    if model.last_modified_by_id != 2:
+        api_user = get_api_user()
+        json_data, req_hash = process_data(model)
+        response = None
+        url = '/'.join([registry_endpoints.get('add_model'), req_hash])
+        try:
+            response = requests.post(url, data=json_data)
+            if response.status_code == 200 and not model.is_registered():
+                model.register()
+                model.save(api_user)
+        except requests.exceptions.RequestException as e:
+            print(e)
+        return response
 
 def process_data(model):
     """

qipr_approver/approver/custom_commands/__init__.py

@@ -1,3 +1,3 @@
 from approver.custom_commands.load_ascii_mesh import load_ascii_mesh as loadmesh
-from approver.custom_commands.load_people import load_people as loadpeople
-from approver.custom_commands.load_projects import load_projects as loadprojects
+from approver.custom_commands.load_people import load_contacts as loadcontacts
+from approver.custom_commands.load_projects import load_projects as loadprojects

qipr_approver/approver/custom_commands/load_people.py

@@ -1,6 +1,6 @@
 import approver.parsers.people_ingest.actions as line_actions
 
-def load_people(argv):
+def load_contacts(argv):
     filename = argv[2]
     stream_parse(filename)
 

qipr_approver/approver/forms/project_form.py

@@ -1,5 +1,5 @@
 from django.utils import timezone
-from approver.models import Project, ClinicalArea, ClinicalSetting, Person, BigAim, Descriptor
+from approver.models import Project, ClinicalArea, ClinicalSetting, Person, BigAim, Descriptor, Contact
 from django.contrib.auth.models import User
 from approver import utils
 
@@ -19,20 +19,20 @@ def __init__(self, project=Project(),is_disabled=False):
                       'value': project.title or ''}
 
         self.collaborator = {'name': 'collaborator',
-                             'model': 'person',
+                             'model': 'contact',
                              'placeholder': 'e.g. Alligator, Albert',
                              'label': 'Type collaborator name, then press "enter" to save',
-                             'filter_field': ';'.join(['email_address','first_name', 'last_name']),
-                             'tag_prop': Person.tag_property_name,
-                             'selected': utils.get_related_property(project, "collaborator", 'email_address')}
+                             'filter_field': ';'.join(['business_email','first_name', 'last_name']),
+                             'tag_prop': Contact.tag_property_name,
+                             'selected': utils.get_related(project, "collaborator")}
 
         self.advisor = {'name': 'advisor',
-                        'model': 'person',
+                        'model': 'contact',
                         'placeholder': 'e.g. Alligator, Alberta',
                         'label': 'Type advisor name, then press "enter" to save',
-                        'filter_field': ';'.join(['email_address','first_name', 'last_name']),
-                        'tag_prop': Person.tag_property_name,
-                        'selected': utils.get_related_property(project, "advisor", 'email_address')}
+                        'filter_field': ';'.join(['business_email','first_name', 'last_name']),
+                        'tag_prop': Contact.tag_property_name,
+                        'selected': utils.get_related(project, "advisor")}
 
         self.mesh_keyword = {'name': 'mesh_keyword',
                              'label': 'Please indicate 5 or more MeSH (Medical Subject Headings) keywords relating to your project. MeSH keywords are a comprehensive controlled vocabulary for the purpose of indexing journal articles and books. Type keyword, then press "enter" to save',

qipr_approver/approver/middleware/approver_shibboleth_middleware.py

@@ -7,6 +7,7 @@
 
 from approver.models import Person, Address
 from approver import utils
+from approver.workflows.contact_person import add_contact_for_person
 
 
 class ApproverShibbolethMiddleware(object):
@@ -81,7 +82,7 @@ def update_or_create_person(self, request):
         based on the authenticated user. It will add or update values
         found in the request META data which are supplied from Shibboleth.
         """
-        created = False
+        created = True
         defaults={
                 'first_name':request.META['HTTP_GIVENNAME'],
                 'last_name':request.META['HTTP_SN'],
@@ -91,15 +92,24 @@ def update_or_create_person(self, request):
                 'account_expiration_time':utils.get_account_expiration_date(timezone.now()),
                 }
 
+        request.user.first_name = defaults.get('first_name')
+        request.user.last_name = defaults.get('last_name')
+        request.user.email = defaults.get('email_address')
+
         try:
-            person = Person.objects.get(user=request.user)
+            try:
+                person = request.user.person
+                created = False
+            except:
+                person = Person.objects.get(email_address=request.user.username)
+                person.user = request.user
             person.account_expiration_time = utils.get_account_expiration_date(timezone.now())
             person.save(request.user)
         except Person.DoesNotExist:
             person = Person(**defaults)
             person.user = request.user
             person.save(request.user)
-            created = True
+            add_contact_for_person(person, request.user)
 
         if not person.business_address.count():
             self._add_person_address(request, person)

qipr_approver/approver/migrations/0004_contact.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-01-26 15:44
+from __future__ import unicode_literals
+
+import approver.utils
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('approver', '0003_auto_20170124_1432'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Contact',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('last_modified', models.DateTimeField(auto_now=True)),
+                ('guid', models.CharField(default=approver.utils.get_guid, editable=False, max_length=32)),
+                ('in_registry', models.BooleanField(default=False)),
+                ('business_email', models.CharField(max_length=100, null=True)),
+                ('business_fax', models.CharField(max_length=20, null=True)),
+                ('business_phone', models.CharField(max_length=50, null=True)),
+                ('display_name', models.CharField(max_length=70)),
+                ('first_name', models.CharField(max_length=30)),
+                ('gatorlink', models.CharField(max_length=50, null=True)),
+                ('last_name', models.CharField(max_length=30)),
+                ('middle_name', models.CharField(max_length=30)),
+                ('name_prefix', models.CharField(max_length=30)),
+                ('name_suffix', models.CharField(max_length=30)),
+                ('working_title', models.CharField(max_length=30)),
+                ('created_by', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('last_modified_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('person', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='approver.Person')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

qipr_approver/approver/migrations/0005_merge_20170201_1456.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-01 14:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('approver', '0004_contact'),
+        ('approver', '0004_project_sent_email_list'),
+    ]
+
+    operations = [
+    ]

qipr_approver/approver/models/__init__.py

@@ -1,8 +1,13 @@
+# Mixin models
+from approver.models.provenance import Provenance
+from approver.models.tag_models import Tag, TagPrint, TaggedWithName
+from approver.models.bridge_models import Registerable
+
+# Main models file
 from approver.models.models import *
+
+from approver.models.access_log import AccessLog
 from approver.models.approve_models import *
 from approver.models.audit_trail_models import AuditTrail
-from approver.models.bridge_models import Registerable
-from approver.models.provenance import Provenance
+from approver.models.contact import Contact
 from approver.models.mesh_models import *
-from approver.models.tag_models import Tag, TagPrint, TaggedWithName
-from approver.models.access_log import AccessLog