From e6772fc67cfe9e735448f33c63d2f404831f4353 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 12 Aug 2021 17:17:05 -0400
Subject: [PATCH] Afform - Store submissions in a new database table

This adds the `civicrm_afform_submission` table and accompanying api entity,
and a new Afform setting "create_submission" which will store a
submission record whenever a form is submitted.
---
 .../ang/afGuiEditor/afGuiEditor.component.js  |   1 +
 .../admin/ang/afGuiEditor/config-form.html    |   8 +
 .../core/CRM/Afform/BAO/AfformSubmission.php  |   6 +
 .../core/CRM/Afform/DAO/AfformSubmission.php  | 247 ++++++++++++++++++
 ext/afform/core/CRM/Afform/Upgrader.php       |  11 +
 .../core/Civi/Api4/Action/Afform/Submit.php   |  10 +
 ext/afform/core/Civi/Api4/Afform.php          |   4 +
 .../core/Civi/Api4/AfformSubmission.php       |  14 +
 ext/afform/core/afform.civix.php              |   8 +-
 ext/afform/core/sql/auto_install.sql          |  45 ++++
 ext/afform/core/sql/auto_uninstall.sql        |  20 ++
 .../Afform/AfformSubmission.entityType.php    |  10 +
 .../schema/CRM/Afform/AfformSubmission.xml    |  66 +++++
 .../phpunit/api/v4/AfformContactUsageTest.php |  19 +-
 14 files changed, 466 insertions(+), 3 deletions(-)
 create mode 100644 ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
 create mode 100644 ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
 create mode 100644 ext/afform/core/Civi/Api4/AfformSubmission.php
 create mode 100644 ext/afform/core/sql/auto_install.sql
 create mode 100644 ext/afform/core/sql/auto_uninstall.sql
 create mode 100644 ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
 create mode 100644 ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml

diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
index a44f6eeb81..6ed1d027bd 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
@@ -69,6 +69,7 @@
 
           if (editor.mode === 'create') {
             editor.addEntity(editor.entity);
+            editor.afform.create_submission = true;
             editor.layout['#children'].push(afGui.meta.elements.submit.element);
           }
         }
diff --git a/ext/afform/admin/ang/afGuiEditor/config-form.html b/ext/afform/admin/ang/afGuiEditor/config-form.html
index 59d04705b9..466f4bc251 100644
--- a/ext/afform/admin/ang/afGuiEditor/config-form.html
+++ b/ext/afform/admin/ang/afGuiEditor/config-form.html
@@ -88,6 +88,14 @@
 
     <legend>{{:: ts('Submit Actions') }}</legend>
 
+    <div class="form-group" >
+      <label>
+        <input type="checkbox" ng-model="editor.afform.create_submission" >
+        {{:: ts('Log Submissions') }}
+      </label>
+      <p class="help-block">{{:: ts('Keep a log of the date, time, user, and items saved by each form submission.') }}</p>
+    </div>
+
     <div class="form-group" ng-class="{'has-error': !!config_form.redirect.$error.pattern}">
       <label for="af_config_redirect">
         {{:: ts('Post-Submit Page') }}
diff --git a/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php b/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
new file mode 100644
index 0000000000..5e2bc34bb7
--- /dev/null
+++ b/ext/afform/core/CRM/Afform/BAO/AfformSubmission.php
@@ -0,0 +1,6 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+class CRM_Afform_BAO_AfformSubmission extends CRM_Afform_DAO_AfformSubmission {
+
+}
diff --git a/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php b/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
new file mode 100644
index 0000000000..c0a9f1c2ef
--- /dev/null
+++ b/ext/afform/core/CRM/Afform/DAO/AfformSubmission.php
@@ -0,0 +1,247 @@
+<?php
+
+/**
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ *
+ * Generated from org.civicrm.afform/xml/schema/CRM/Afform/AfformSubmission.xml
+ * DO NOT EDIT.  Generated by CRM_Core_CodeGen
+ * (GenCodeChecksum:3018ef7f1283f7a38cdf9edae76df274)
+ */
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Database access object for the AfformSubmission entity.
+ */
+class CRM_Afform_DAO_AfformSubmission extends CRM_Core_DAO {
+  const EXT = E::LONG_NAME;
+  const TABLE_ADDED = '';
+
+  /**
+   * Static instance to hold the table name.
+   *
+   * @var string
+   */
+  public static $_tableName = 'civicrm_afform_submission';
+
+  /**
+   * Should CiviCRM log any modifications to this table in the civicrm_log table.
+   *
+   * @var bool
+   */
+  public static $_log = TRUE;
+
+  /**
+   * Unique Submission ID
+   *
+   * @var int
+   */
+  public $id;
+
+  /**
+   * @var int
+   */
+  public $contact_id;
+
+  /**
+   * Name of submitted afform
+   *
+   * @var string
+   */
+  public $afform_name;
+
+  /**
+   * IDs of saved entities
+   *
+   * @var text
+   */
+  public $data;
+
+  /**
+   * @var timestamp
+   */
+  public $submission_date;
+
+  /**
+   * Class constructor.
+   */
+  public function __construct() {
+    $this->__table = 'civicrm_afform_submission';
+    parent::__construct();
+  }
+
+  /**
+   * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
+   */
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? E::ts('Form Builder Submissions') : E::ts('Form Builder Submission');
+  }
+
+  /**
+   * Returns foreign keys and entity references.
+   *
+   * @return array
+   *   [CRM_Core_Reference_Interface]
+   */
+  public static function getReferenceColumns() {
+    if (!isset(Civi::$statics[__CLASS__]['links'])) {
+      Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
+      Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id');
+      CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
+    }
+    return Civi::$statics[__CLASS__]['links'];
+  }
+
+  /**
+   * Returns all the column names of this table
+   *
+   * @return array
+   */
+  public static function &fields() {
+    if (!isset(Civi::$statics[__CLASS__]['fields'])) {
+      Civi::$statics[__CLASS__]['fields'] = [
+        'id' => [
+          'name' => 'id',
+          'type' => CRM_Utils_Type::T_INT,
+          'description' => E::ts('Unique Submission ID'),
+          'required' => TRUE,
+          'where' => 'civicrm_afform_submission.id',
+          'table_name' => 'civicrm_afform_submission',
+          'entity' => 'AfformSubmission',
+          'bao' => 'CRM_Afform_DAO_AfformSubmission',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
+          'readonly' => TRUE,
+          'add' => '5.41',
+        ],
+        'contact_id' => [
+          'name' => 'contact_id',
+          'type' => CRM_Utils_Type::T_INT,
+          'title' => E::ts('User Contact ID'),
+          'where' => 'civicrm_afform_submission.contact_id',
+          'table_name' => 'civicrm_afform_submission',
+          'entity' => 'AfformSubmission',
+          'bao' => 'CRM_Afform_DAO_AfformSubmission',
+          'localizable' => 0,
+          'FKClassName' => 'CRM_Contact_DAO_Contact',
+          'add' => '5.41',
+        ],
+        'afform_name' => [
+          'name' => 'afform_name',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => E::ts('Afform Name'),
+          'description' => E::ts('Name of submitted afform'),
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_afform_submission.afform_name',
+          'table_name' => 'civicrm_afform_submission',
+          'entity' => 'AfformSubmission',
+          'bao' => 'CRM_Afform_DAO_AfformSubmission',
+          'localizable' => 0,
+          'add' => '5.41',
+        ],
+        'data' => [
+          'name' => 'data',
+          'type' => CRM_Utils_Type::T_TEXT,
+          'title' => E::ts('Submission Data'),
+          'description' => E::ts('IDs of saved entities'),
+          'where' => 'civicrm_afform_submission.data',
+          'table_name' => 'civicrm_afform_submission',
+          'entity' => 'AfformSubmission',
+          'bao' => 'CRM_Afform_DAO_AfformSubmission',
+          'localizable' => 0,
+          'serialize' => self::SERIALIZE_JSON,
+          'add' => '5.41',
+        ],
+        'submission_date' => [
+          'name' => 'submission_date',
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
+          'title' => E::ts('Submission Date/Time'),
+          'where' => 'civicrm_afform_submission.submission_date',
+          'default' => 'CURRENT_TIMESTAMP',
+          'table_name' => 'civicrm_afform_submission',
+          'entity' => 'AfformSubmission',
+          'bao' => 'CRM_Afform_DAO_AfformSubmission',
+          'localizable' => 0,
+          'readonly' => TRUE,
+          'add' => '5.41',
+        ],
+      ];
+      CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
+    }
+    return Civi::$statics[__CLASS__]['fields'];
+  }
+
+  /**
+   * Return a mapping from field-name to the corresponding key (as used in fields()).
+   *
+   * @return array
+   *   Array(string $name => string $uniqueName).
+   */
+  public static function &fieldKeys() {
+    if (!isset(Civi::$statics[__CLASS__]['fieldKeys'])) {
+      Civi::$statics[__CLASS__]['fieldKeys'] = array_flip(CRM_Utils_Array::collect('name', self::fields()));
+    }
+    return Civi::$statics[__CLASS__]['fieldKeys'];
+  }
+
+  /**
+   * Returns the names of this table
+   *
+   * @return string
+   */
+  public static function getTableName() {
+    return self::$_tableName;
+  }
+
+  /**
+   * Returns if this table needs to be logged
+   *
+   * @return bool
+   */
+  public function getLog() {
+    return self::$_log;
+  }
+
+  /**
+   * Returns the list of fields that can be imported
+   *
+   * @param bool $prefix
+   *
+   * @return array
+   */
+  public static function &import($prefix = FALSE) {
+    $r = CRM_Core_DAO_AllCoreTables::getImports(__CLASS__, 'afform_submission', $prefix, []);
+    return $r;
+  }
+
+  /**
+   * Returns the list of fields that can be exported
+   *
+   * @param bool $prefix
+   *
+   * @return array
+   */
+  public static function &export($prefix = FALSE) {
+    $r = CRM_Core_DAO_AllCoreTables::getExports(__CLASS__, 'afform_submission', $prefix, []);
+    return $r;
+  }
+
+  /**
+   * Returns the list of indices
+   *
+   * @param bool $localize
+   *
+   * @return array
+   */
+  public static function indices($localize = TRUE) {
+    $indices = [];
+    return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
+  }
+
+}
diff --git a/ext/afform/core/CRM/Afform/Upgrader.php b/ext/afform/core/CRM/Afform/Upgrader.php
index 2786478f02..8dc7fb61a3 100644
--- a/ext/afform/core/CRM/Afform/Upgrader.php
+++ b/ext/afform/core/CRM/Afform/Upgrader.php
@@ -50,7 +50,18 @@ class CRM_Afform_Upgrader extends CRM_Afform_Upgrader_Base {
       }
       file_put_contents($fileName, json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
     }
+    return TRUE;
+  }
 
+  /**
+   * Upgrade 1000 - install civicrm_afform_submission table
+   * @return bool
+   */
+  public function upgrade_1001() {
+    $this->ctx->log->info('Applying update 1001 - install civicrm_afform_submission table.');
+    if (!CRM_Core_DAO::singleValueQuery("SHOW TABLES LIKE 'civicrm_afform_submission'")) {
+      $this->executeSqlFile('sql/auto_install.sql');
+    }
     return TRUE;
   }
 
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index c33cb29bb4..484a01ce37 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -3,6 +3,7 @@
 namespace Civi\Api4\Action\Afform;
 
 use Civi\Afform\Event\AfformSubmitEvent;
+use Civi\Api4\AfformSubmission;
 
 /**
  * Class Submit
@@ -59,6 +60,15 @@ class Submit extends AbstractProcessor {
       \Civi::dispatcher()->dispatch('civi.afform.submit', $event);
     }
 
+    // Save submission record
+    if (!empty($this->_afform['create_submission'])) {
+      $submission = AfformSubmission::create(FALSE)
+        ->addValue('contact_id', \CRM_Core_Session::getLoggedInContactID())
+        ->addValue('afform_name', $this->name)
+        ->addValue('data', $this->_entityIds)
+        ->execute()->first();
+    }
+
     // What should I return?
     return [];
   }
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 6c6f435f08..f868b6931a 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -182,6 +182,10 @@ class Afform extends Generic\AbstractEntity {
         [
           'name' => 'redirect',
         ],
+        [
+          'name' => 'create_submission',
+          'data_type' => 'Boolean',
+        ],
         [
           'name' => 'layout',
           'data_type' => 'Array',
diff --git a/ext/afform/core/Civi/Api4/AfformSubmission.php b/ext/afform/core/Civi/Api4/AfformSubmission.php
new file mode 100644
index 0000000000..f909d127c8
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/AfformSubmission.php
@@ -0,0 +1,14 @@
+<?php
+namespace Civi\Api4;
+
+/**
+ * AfformSubmission entity.
+ *
+ * Provided by the Afform: Core Runtime extension.
+ *
+ * @searchable secondary
+ * @package Civi\Api4
+ */
+class AfformSubmission extends Generic\DAOEntity {
+
+}
diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index 1ab6c2b2cf..1a10bb02d0 100644
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -449,5 +449,11 @@ function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
 function _afform_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, []);
+  $entityTypes = array_merge($entityTypes, [
+    'CRM_Afform_DAO_AfformSubmission' => [
+      'name' => 'AfformSubmission',
+      'class' => 'CRM_Afform_DAO_AfformSubmission',
+      'table' => 'civicrm_afform_submission',
+    ],
+  ]);
 }
diff --git a/ext/afform/core/sql/auto_install.sql b/ext/afform/core/sql/auto_install.sql
new file mode 100644
index 0000000000..e18f3df3a9
--- /dev/null
+++ b/ext/afform/core/sql/auto_install.sql
@@ -0,0 +1,45 @@
+-- +--------------------------------------------------------------------+
+-- | Copyright CiviCRM LLC. All rights reserved.                        |
+-- |                                                                    |
+-- | This work is published under the GNU AGPLv3 license with some      |
+-- | permitted exceptions and without any warranty. For full license    |
+-- | and copyright information, see https://civicrm.org/licensing       |
+-- +--------------------------------------------------------------------+
+--
+-- Generated from schema.tpl
+-- DO NOT EDIT.  Generated by CRM_Core_CodeGen
+--
+-- /*******************************************************
+-- *
+-- * Clean up the existing tables - this section generated from drop.tpl
+-- *
+-- *******************************************************/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+DROP TABLE IF EXISTS `civicrm_afform_submission`;
+
+SET FOREIGN_KEY_CHECKS=1;
+-- /*******************************************************
+-- *
+-- * Create new tables
+-- *
+-- *******************************************************/
+
+-- /*******************************************************
+-- *
+-- * civicrm_afform_submission
+-- *
+-- * Recorded form submissions
+-- *
+-- *******************************************************/
+CREATE TABLE `civicrm_afform_submission` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Submission ID',
+  `contact_id` int unsigned,
+  `afform_name` varchar(255) COMMENT 'Name of submitted afform',
+  `data` text COMMENT 'IDs of saved entities',
+  `submission_date` timestamp DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  CONSTRAINT FK_civicrm_afform_submission_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
+)
+ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
diff --git a/ext/afform/core/sql/auto_uninstall.sql b/ext/afform/core/sql/auto_uninstall.sql
new file mode 100644
index 0000000000..90004586bc
--- /dev/null
+++ b/ext/afform/core/sql/auto_uninstall.sql
@@ -0,0 +1,20 @@
+-- +--------------------------------------------------------------------+
+-- | Copyright CiviCRM LLC. All rights reserved.                        |
+-- |                                                                    |
+-- | This work is published under the GNU AGPLv3 license with some      |
+-- | permitted exceptions and without any warranty. For full license    |
+-- | and copyright information, see https://civicrm.org/licensing       |
+-- +--------------------------------------------------------------------+
+--
+-- Generated from drop.tpl
+-- DO NOT EDIT.  Generated by CRM_Core_CodeGen
+---- /*******************************************************
+-- *
+-- * Clean up the existing tables-- *
+-- *******************************************************/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+DROP TABLE IF EXISTS `civicrm_afform_submission`;
+
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php b/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
new file mode 100644
index 0000000000..7b3362da3f
--- /dev/null
+++ b/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.entityType.php
@@ -0,0 +1,10 @@
+<?php
+// This file declares a new entity type. For more details, see "hook_civicrm_entityTypes" at:
+// https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+return [
+  [
+    'name' => 'AfformSubmission',
+    'class' => 'CRM_Afform_DAO_AfformSubmission',
+    'table' => 'civicrm_afform_submission',
+  ],
+];
diff --git a/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml b/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml
new file mode 100644
index 0000000000..28278d26ab
--- /dev/null
+++ b/ext/afform/core/xml/schema/CRM/Afform/AfformSubmission.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<table>
+  <base>CRM/Afform</base>
+  <class>AfformSubmission</class>
+  <name>civicrm_afform_submission</name>
+  <comment>Recorded form submissions</comment>
+  <title>Form Builder Submission</title>
+  <log>true</log>
+
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Unique Submission ID</comment>
+    <html>
+      <type>Number</type>
+    </html>
+    <add>5.41</add>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+
+  <field>
+    <name>contact_id</name>
+    <type>int unsigned</type>
+    <title>User Contact ID</title>
+    <add>5.41</add>
+  </field>
+  <foreignKey>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>SET NULL</onDelete>
+  </foreignKey>
+
+  <field>
+    <name>afform_name</name>
+    <type>varchar</type>
+    <length>255</length>
+    <title>Afform Name</title>
+    <comment>Name of submitted afform</comment>
+    <add>5.41</add>
+  </field>
+
+  <field>
+    <name>data</name>
+    <type>text</type>
+    <title>Submission Data</title>
+    <comment>IDs of saved entities</comment>
+    <serialize>JSON</serialize>
+    <add>5.41</add>
+  </field>
+
+  <field>
+    <name>submission_date</name>
+    <type>timestamp</type>
+    <title>Submission Date/Time</title>
+    <default>CURRENT_TIMESTAMP</default>
+    <readonly>true</readonly>
+    <add>5.41</add>
+  </field>
+
+</table>
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
index ab9dfde7c0..7e0b2f6f46 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php
@@ -91,6 +91,7 @@ EOHTML;
     $this->useValues([
       'layout' => self::$layouts['registerSite'],
       'permission' => CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION,
+      'create_submission' => TRUE,
     ]);
 
     $firstName = uniqid(__FUNCTION__);
@@ -120,10 +121,24 @@ EOHTML;
       ->setName($this->formName)
       ->setValues($values)
       ->execute();
+
+    $submission = Civi\Api4\AfformSubmission::get(FALSE)
+      ->addOrderBy('id', 'DESC')
+      ->execute()->first();
+
+    $this->assertEquals($this->formName, $submission['afform_name']);
+    $this->assertIsInt($submission['data']['Activity1'][0]['id']);
+    $this->assertIsInt($submission['data']['Individual1'][0]['id']);
+
     // Check that Activity was submitted correctly.
-    $activity = \Civi\Api4\Activity::get(FALSE)->execute()->first();
+    $activity = \Civi\Api4\Activity::get(FALSE)
+      ->addWhere('id', '=', $submission['data']['Activity1'][0]['id'])
+      ->execute()->first();
     $this->assertEquals('Individual1', $activity['subject']);
-    $contact = \Civi\Api4\Contact::get()->addWhere('first_name', '=', $firstName)->execute()->first();
+    $contact = \Civi\Api4\Contact::get()
+      ->addWhere('id', '=', $submission['data']['Individual1'][0]['id'])
+      ->execute()->first();
+    $this->assertEquals($firstName, $contact['first_name']);
     $this->assertEquals('site', $contact['last_name']);
     // Check that the data overrides form submsision
     $this->assertEquals('Register A site', $contact['source']);
-- 
2.25.1