Fix webling sync

Author: Michael-Schaer

app/Http/CrmClient.php

@@ -16,7 +16,7 @@ class CrmClient
     private $clientSecret;
     private $token;
     private $guzzle;
-    
+
     /**
      * CrmClient constructor
      *
@@ -29,10 +29,10 @@ public function __construct(int $clientId, string $clientSecret, string $apiUrl)
         $this->clientId = $clientId;
         $this->clientSecret = $clientSecret;
         $this->guzzle = new Client(['base_uri' => $this->forceSSL($apiUrl)]);
-        
+
         $this->loadToken();
     }
-    
+
     /**
      * Make sure the given url is always using httpS
      *
@@ -44,28 +44,28 @@ private function forceSSL(string $url)
     {
         $url = preg_replace('/^\/\//', 'https://', $url);
         $url = preg_replace('/^http:\/\//', 'https://', $url);
-        
+
         return $url;
     }
-    
+
     /**
      * Get the oauth token of this client
      */
     private function loadToken()
     {
         $client = OAuthClient::find($this->clientId);
-        
+
         if (!$client) {
             $client = $this->addClient();
         }
-        
+
         $this->token = $client->token;
-        
+
         if (!$this->isTokenValid()) {
             $this->refreshToken($client);
         }
     }
-    
+
     /**
      * Add new client
      *
@@ -74,14 +74,14 @@ private function loadToken()
     private function addClient(): OAuthClient
     {
         $client = new OAuthClient();
-        
+
         $client->client_id = $this->clientId;
         $client->client_secret = $this->clientSecret;
         $client->save();
-        
+
         return $client;
     }
-    
+
     /**
      * Test the current token against the api to chekc if it is (still) valid
      *
@@ -93,13 +93,13 @@ private function isTokenValid(): bool
     {
         try {
             $this->get('/api/v1/auth');
-            
+
             return true;
         } catch (ClientException $e) {
             return false;
         }
     }
-    
+
     /**
      * Get
      *
@@ -115,10 +115,10 @@ public function get(string $relativeUrl)
             'Authorization' => 'Bearer ' . $this->token,
             'Accept' => 'application/json',
         ];
-        
+
         return $this->guzzle->get($relativeUrl, ['headers' => $headers]);
     }
-    
+
     /**
      * Get a fresh access token
      *
@@ -128,7 +128,9 @@ public function get(string $relativeUrl)
      */
     private function refreshToken(OAuthClient $client)
     {
-        $res = $this->guzzle->post('/oauth/token', [
+        $res = $this->guzzle->post(
+            '/oauth/token',
+            [
                 'form_params' => [
                     'grant_type' => 'client_credentials',
                     'client_id' => $this->clientId,
@@ -137,14 +139,14 @@ private function refreshToken(OAuthClient $client)
                 ]
             ]
         );
-        
+
         $body = json_decode((string)$res->getBody());
         $this->token = $body->access_token;
-        
+
         $client->token = $this->token;
         $client->save();
     }
-    
+
     /**
      * Upsert
      *
@@ -158,11 +160,15 @@ private function refreshToken(OAuthClient $client)
     public function post(string $relativeUrl, array $data)
     {
         return $this->guzzle->post($relativeUrl, [
-            'headers' => ['Authorization' => 'Bearer ' . $this->token],
-            'body' => json_encode($data)
+            'headers' => [
+                'Authorization' => 'Bearer ' . $this->token,
+                'Accept' => 'application/json',
+            ],
+            'json' => $data,
+            'allow_redirects' => false,
         ]);
     }
-    
+
     /**
      * Update
      *
@@ -180,4 +186,4 @@ public function put(string $relativeUrl, array $data)
             'body' => json_encode($data)
         ]);
     }
-}
+}

app/Http/MailChimpClient.php

@@ -431,18 +431,12 @@ public function removeTagFromSubscriber(string $subscriberId, string $tagName)
      * @return array|false
      * @throws MailchimpClientException
      */
-    public function updateSubscriberInterests(string $subscriberId, array $mergeFields, string $interestId)
+    public function updateMergeFields(string $subscriberId, array $mergeFields)
     {
         $data = [
             'merge_fields' => $mergeFields,
         ];
 
-        if (!empty($interestId)) {
-            $data['interests'] = [
-                $interestId => true
-            ];
-        }
-
         $patch = $this->client->patch("lists/{$this->listId}/members/$subscriberId", $data, self::API_WRITE_TIMEOUT);
 
         $this->validateResponseStatus('PATCH subscriber interests', $patch);

app/Synchronizer/Config.php

@@ -338,8 +338,17 @@ public function getLanguageTagsFromConfig(): array
                 $fieldMap->canSyncToMailchimp() &&
                 $fieldMap->getCrmKey() === 'language'
             ) {
-                $mailchimpData = $fieldMap->getMailchimpDataArray();
-                foreach ($mailchimpData as $tagName => $value) {
+                $reflection = new \ReflectionObject($fieldMap);
+                $property = $reflection->getProperty('field');
+                $property->setAccessible(true);
+                $field = $property->getValue($fieldMap);
+
+                $tagReflection = new \ReflectionObject($field);
+                $tagNameProperty = $tagReflection->getProperty('mailchimpTagName');
+                $tagNameProperty->setAccessible(true);
+                $tagName = $tagNameProperty->getValue($field);
+
+                if (!empty($tagName)) {
                     $languageTags[] = $tagName;
                 }
             }
@@ -392,34 +401,36 @@ public function getInterestsToSync(): array
     }
 
     /**
-     * Return configurable field that is used to determine if a member should be synced
-     *
-     * @return string
+     * Return the number of months to consider for the changed within filter
      *
-     * @throws ConfigException
+     * @return int
      */
-    public function getSyncCriteriaField(): string
+    public function getChangedWithinMonths(): int
     {
-        if (empty($this->mailchimpToCrm['syncCriteriaField'])) {
-            throw new ConfigException('Missing "syncCriteriaField" field.');
-        }
-
-        return $this->mailchimpToCrm['syncCriteriaField'];
+        return $this->mailchimpToCrm['changedWithinMonths'] ?? 6;
     }
 
     /**
-     * Return configurable threshold used together with syncCriteriaField.
+     * Return the number of months to consider for the opt-in older than filter
      *
      * @return int
+     */
+    public function getOptInOlderThanMonths(): int
+    {
+        return $this->mailchimpToCrm['optInOlderThanMonths'] ?? 2;
+    }
+
+    /**
+     * Return the group where new people should be added in the crm
      *
-     * @throws ConfigException
+     * @return int
      */
-    public function getSyncCriteriaThreshold(): int
+    public function getGroupForNewMembers(): int
     {
-        if (empty($this->mailchimpToCrm['syncCriteriaThreshold'])) {
-            throw new ConfigException('Missing "syncCriteriaThreshold" field.');
+        if (empty($this->mailchimpToCrm['groupForNewMembers'])) {
+            throw new ConfigException('Missing "groupForNewMembers" field.');
         }
 
-        return $this->mailchimpToCrm['syncCriteriaThreshold'];
+        return $this->mailchimpToCrm['groupForNewMembers'];
     }
 }