Layout fixes, cover update for files.

[wolnelektury.git] / src / club / civicrm.py

diff --git a/src/club/civicrm.py b/src/club/civicrm.py
index c44f6f8..20b287a 100644 (file)
--- a/src/club/civicrm.py
+++ b/src/club/civicrm.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 import json
 from datetime import datetime
 import json

-from celery.task import task
+from celery import shared_task

 from django.conf import settings
 import requests
 import yaml
 from django.conf import settings
 import requests
 import yaml


@@ -9,8 +9,8 @@ import yaml
 class CiviCRM:
     def __init__(self, base, key):
         self.base = base
 class CiviCRM:
     def __init__(self, base, key):
         self.base = base

-        self.api_base = base + 'civicrm/ajax/api4/'

         self.key = key
         self.key = key

+        self.api_base = (base or '') + 'civicrm/ajax/api4/'

         self.enabled = bool(self.base and self.key)
 
     def request(self, resource, method, params):
         self.enabled = bool(self.base and self.key)
 
     def request(self, resource, method, params):


@@ -27,11 +27,11 @@ class CiviCRM:
         d = response.json()
         return d
 
         d = response.json()
         return d
 

-    def create_or_update_contact(self, email, key):
+    def create_or_update_contact(self, email, key=None):

         contact_id = self.get_contact_id(email)
         if contact_id is None:
             contact_id = self.create_contact(email, key)
         contact_id = self.get_contact_id(email)
         if contact_id is None:
             contact_id = self.create_contact(email, key)

-        else:
+        elif key:

             self.update_contact(contact_id, key)
         return contact_id
 
             self.update_contact(contact_id, key)
         return contact_id
 


@@ -49,29 +49,26 @@ class CiviCRM:
         if result:
             return result[0]['id']
 
         if result:
             return result[0]['id']
 

-    def create_contact(self, email, key):
-        result = self.request(
-            'Contact',
-            'create',
-            {
-                'values': {
-                    'WL.TPWL_key': key,
-                },
-                'chain': {
-                    'email': [
-                        'Email',
-                        'create',
-                        {
-                            'values': {
-                                'email': email,
-                                'contact_id': '$id'
-                            }
+    def create_contact(self, email, key=None):
+        data = {
+            'values': {},
+            'chain': {
+                'email': [
+                    'Email',
+                    'create',
+                    {
+                        'values': {
+                            'email': email,
+                            'contact_id': '$id'

                         }
                         }

-                    ]
-                }
+                    }
+                ]

             }
             }

-        )
-        return result[0]['id']
+        }
+        if key:
+            data['values']['WL.TPWL_key'] =  key
+        result = self.request('Contact', 'create', data)
+        return result['values'][0]['id']

     
     def update_contact(self, contact_id, key):
         return self.request(
     
     def update_contact(self, contact_id, key):
         return self.request(


@@ -89,6 +86,9 @@ class CiviCRM:
                 
 
     def report_activity(self, email, tpwl_key, key, name, datetime, details):
                 
 
     def report_activity(self, email, tpwl_key, key, name, datetime, details):

+        if not self.enabled:
+            return
+

         contact_id = self.create_or_update_contact(email, tpwl_key)
 
         activity_id = self.get_activity_id(key)
         contact_id = self.create_or_update_contact(email, tpwl_key)
 
         activity_id = self.get_activity_id(key)


@@ -160,7 +160,21 @@ class CiviCRM:
             }
         )
     
             }
         )
     

-    #do we create a civicontribution?
+    def add_email_to_group(self, email, group_id):
+        contact_id = self.create_or_update_contact(email)
+        self.add_contact_to_group(contact_id, group_id)
+
+    def add_contact_to_group(self, contact_id, group_id):
+        self.request(
+            'GroupContact',
+            'create',
+            {
+                "values": {
+                    "group_id": group_id,
+                    "contact_id": contact_id,
+                }
+            }
+        )

 
 
 civicrm = CiviCRM(
 
 
 civicrm = CiviCRM(


@@ -168,7 +182,7 @@ civicrm = CiviCRM(
     settings.CIVICRM_KEY,
 )
 
     settings.CIVICRM_KEY,
 )
 

-@task(ignore_result=True)
+@shared_task(ignore_result=True)

 def report_activity(*args, **kwargs):
     civicrm.report_activity(*args, **kwargs)
 
 def report_activity(*args, **kwargs):
     civicrm.report_activity(*args, **kwargs)