Fix/3.7 web integration

civicrm/custom/php/CRM/NYSS/BAO/Integration/Website.php

@@ -775,7 +775,7 @@ static function processSurvey($contactId, $action, $params)
     $actParams = [
       'subject' => $params->form_title,
       'date' => date('Y-m-d H:i:s'),
-      'activity_type_id' => CRM_Core_OptionGroup::getValue('activity_type', 'Website Survey', 'name'),
+      'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Website Survey'),
       'details' => (!empty($params->detail)) ? $params->detail : '',
       'target_contact_id' => $contactId,
       'source_contact_id' => civicrm_api3('uf_match', 'getvalue', [
@@ -971,7 +971,7 @@ static function buildSurvey($data) {
         'title' => "Survey: {$formTitle} [{$data->form_id}]",
         'table_name' => "civicrm_value_surveydata_{$data->form_id}",
         'extends' => ['0' => 'Activity'],
-        'extends_entity_column_value' => CRM_Core_OptionGroup::getValue('activity_type', 'Website Survey', 'name'),
+        'extends_entity_column_value' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Website Survey'),
         'collapse_display' => 1,
         'collapse_adv_display' => 1,
         'style' => 'Inline',

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent.php

@@ -1,8 +1,6 @@
 <?php
 
 use Civi\API\Exception\UnauthorizedException;
-use CRM_Core_DAO;
-use InvalidArgumentException;
 use PhpParser\Node\Expr\Cast\Object_;
 
 abstract class CRM_NYSS_BAO_Integration_WebsiteEvent implements CRM_NYSS_BAO_Integration_WebsiteEventInterface {
@@ -225,15 +223,18 @@ protected function hasEntityTag(int $contact_id, int $tag_id): bool {
    * @throws \CRM_Core_Exception
    */
   protected function createEntityTag(int $contact_id, int $tag_id): void {
-    $results = \Civi\Api4\EntityTag::create($this->getCiviPermissionCheck())
-      ->addValue('entity_table', 'civicrm_contact')
-      ->addValue('entity_id', $contact_id)
-      ->addValue('tag_id', $tag_id)
-      ->setCheckPermissions($this->getCiviPermissionCheck())
-      ->execute();
-
-    if ((count($results) < 1) || (isset($results[0]['error_code']))) {
-      throw new \CRM_Core_Exception('Failed to create tag with error: ' . $results[0]['error_message']);
+    // only create if it doesn't already exist
+    if (! $this->hasEntityTag($contact_id,$tag_id)) {
+        $results = \Civi\Api4\EntityTag::create($this->getCiviPermissionCheck())
+            ->addValue('entity_table', 'civicrm_contact')
+            ->addValue('entity_id', $contact_id)
+            ->addValue('tag_id', $tag_id)
+            ->setCheckPermissions($this->getCiviPermissionCheck())
+            ->execute();
+
+        if ((count($results) < 1) || (isset($results[0]['error_code']))) {
+            throw new \CRM_Core_Exception('Failed to create tag with error: ' . $results[0]['error_message']);
+        }
     }
   }
 
@@ -248,16 +249,18 @@ protected function createEntityTag(int $contact_id, int $tag_id): void {
    * @throws \Civi\API\Exception\UnauthorizedException
    */
   protected function deleteEntityTag(int $contact_id, int $tag_id): void {
-    $results = \Civi\Api4\EntityTag::delete($this->getCiviPermissionCheck())
-      ->addWhere('entity_table', '=', 'civicrm_contact')
-      ->addWhere('entity_id', '=', $contact_id)
-      ->addWhere('tag_id', '=', $tag_id)
-      ->setCheckPermissions($this->getCiviPermissionCheck())
-      ->execute();
-
-    if (count($results) < 1) {
-      throw new \CRM_Core_Exception('Failed to delete entity tag');
-    }
+      if ($this->hasEntityTag($contact_id,$tag_id)) {
+          $results = \Civi\Api4\EntityTag::delete($this->getCiviPermissionCheck())
+              ->addWhere('entity_table', '=', 'civicrm_contact')
+              ->addWhere('entity_id', '=', $contact_id)
+              ->addWhere('tag_id', '=', $tag_id)
+              ->setCheckPermissions($this->getCiviPermissionCheck())
+              ->execute();
+
+          if (count($results) < 1) {
+              throw new \CRM_Core_Exception('Failed to delete entity tag');
+          }
+      }
   }
 
   public function getEventInfo(): object {

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/AccountEvent.php

@@ -1,12 +1,5 @@
 <?php
 
-use CRM_Core_Exception;
-use CRM_NYSS_BAO_Integration_Website;
-use CRM_NYSS_BAO_Integration_WebsiteEventData;
-use Exception;
-use InvalidArgumentException;
-use stdClass;
-
 class CRM_NYSS_BAO_Integration_WebsiteEvent_AccountEvent extends \CRM_NYSS_BAO_Integration_WebsiteEvent implements \CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 
   const ACTIVITY_TYPE = 'Account';

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/BillEvent.php

@@ -1,11 +1,6 @@
 <?php
 
 use Civi\API\Exception\UnauthorizedException;
-use CRM_Core_Exception;
-use CRM_NYSS_BAO_Integration_OpenLegislation;
-use InvalidArgumentException;
-use CRM_NYSS_BAO_Integration_WebsiteEvent;
-use CRM_NYSS_BAO_Integration_WebsiteEventInteface;
 
 class CRM_NYSS_BAO_Integration_WebsiteEvent_BillEvent extends CRM_NYSS_BAO_Integration_WebsiteEvent implements CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/CommitteeEvent.php

@@ -1,10 +1,6 @@
 <?php
 
 use Civi\API\Exception\UnauthorizedException;
-use CRM_Core_Exception;
-use CRM_NYSS_BAO_Integration_WebsiteEvent;
-use CRM_NYSS_BAO_Integration_WebsiteEventInteface;
-use InvalidArgumentException;
 
 class CRM_NYSS_BAO_Integration_WebsiteEvent_CommitteeEvent extends CRM_NYSS_BAO_Integration_WebsiteEvent implements CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/IssueEvent.php

@@ -1,10 +1,6 @@
 <?php
 
 use Civi\API\Exception\UnauthorizedException;
-use CRM_Core_Exception;
-use NYSS_Integration\WebsiteEvent;
-use NYSS_Integration\WebsiteEventInterface;
-use InvalidArgumentException;
 
 class CRM_NYSS_BAO_Integration_WebsiteEvent_IssueEvent extends CRM_NYSS_BAO_Integration_WebsiteEvent implements CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/PetitionEvent.php

@@ -1,7 +1,5 @@
 <?php
 
-use CRM_NYSS_BAO_Integration_WebsiteEvent_PollEvent;
-
 class CRM_NYSS_BAO_Integration_WebsiteEvent_PetitionEvent extends CRM_NYSS_BAO_Integration_WebsiteEvent_PollEvent implements CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 
   use CRM_NYSS_BAO_Integration_WebsiteEvent_FollowableEvent;

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEvent/PollEvent.php

@@ -1,12 +1,6 @@
 <?php
 
 use Civi\API\Exception\UnauthorizedException;
-use CRM_Core_Exception;
-use CRM_NYSS_BAO_Integration_WebsiteEvent_FollowableEvent;
-use CRM_NYSS_BAO_Integration_WebsiteEventData;
-use InvalidArgumentException;
-use CRM_NYSS_BAO_Integration_WebsiteEvent;
-use CRM_NYSS_BAO_Integration_WebsiteEventInteface;
 
 abstract class CRM_NYSS_BAO_Integration_WebsiteEvent_PollEvent extends CRM_NYSS_BAO_Integration_WebsiteEvent implements \CRM_NYSS_BAO_Integration_WebsiteEventInterface {
 

civicrm/custom/php/CRM/NYSS/BAO/Integration/WebsiteEventData.php

@@ -1,6 +1,5 @@
 <?php
 
-use InvalidArgumentException;
 use PhpParser\Node\Expr\Cast\Object_;
 
 class CRM_NYSS_BAO_Integration_WebsiteEventData {