[FEATURE] Add FrontendUser.privacyDateOfAcceptance (#622)

Fixes #615

Author: oliverklee

CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## x.y.z
 
 ### Added
+- Add `FrontendUser.privacyDateOfAcceptance` (#622)
 - Add `FrontendUser.termsDateOfAcceptance` (#620)
 
 ### Changed

Classes/Domain/Model/FrontendUser.php

@@ -200,6 +200,8 @@ class FrontendUser extends AbstractEntity
      */
     protected bool $privacy = false;
 
+    protected ?\DateTime $privacyDateOfAcceptance = null;
+
     /**
      * the "terms and conditions" have been acknowledged
      */
@@ -473,6 +475,16 @@ public function setPrivacy(bool $privacy): void
         $this->privacy = $privacy;
     }
 
+    public function getPrivacyDateOfAcceptance(): ?\DateTime
+    {
+        return $this->privacyDateOfAcceptance;
+    }
+
+    public function setPrivacyDateOfAcceptance(?\DateTime $date): void
+    {
+        $this->privacyDateOfAcceptance = $date;
+    }
+
     public function hasTermsAcknowledged(): bool
     {
         return $this->termsAcknowledged;

Configuration/TCA/Overrides/fe_users.php

@@ -95,6 +95,17 @@
                 'type' => 'check',
             ],
         ],
+        'privacy_date_of_acceptance' => [
+            'exclude' => true,
+            'label' => $languageFile . 'privacyDateOfAcceptance',
+            'config' => [
+                'type' => 'input',
+                'renderType' => 'datetime',
+                'format' => 'datetime',
+                'eval' => 'datetime,int',
+                'readOnly' => true,
+            ],
+        ],
         'terms_acknowledged' => [
             'exclude' => true,
             'label' => $languageFile . 'terms_acknowledged',
@@ -205,6 +216,12 @@
                         ],
                     ],
                 ],
+                'privacy_date_of_acceptance' => [
+                    'config' => [
+                        'renderType' => 'inputDateTime',
+                        'eval' => 'datetime,int',
+                    ],
+                ],
                 'terms_date_of_acceptance' => [
                     'config' => [
                         'renderType' => 'inputDateTime',
@@ -266,6 +283,6 @@
     );
     ExtensionManagementUtility::addToAllTCAtypes(
         'fe_users',
-        'privacy, terms_acknowledged, terms_date_of_acceptance, comments'
+        'privacy, privacy_date_of_acceptance, terms_acknowledged, terms_date_of_acceptance, comments'
     );
 });

Resources/Private/Language/locallang.xlf

@@ -36,6 +36,9 @@
 			<trans-unit id="privacy" resname="privacy">
 				<source>Privacy agreement</source>
 			</trans-unit>
+			<trans-unit id="privacyDateOfAcceptance" resname="privacyDateOfAcceptance">
+				<source>Privacy agreement acknowledged at</source>
+			</trans-unit>
 			<trans-unit id="terms_acknowledged" resname="terms_acknowledged">
 				<source>Terms acknowledged</source>
 			</trans-unit>

Tests/Functional/Domain/Repository/Fixtures/UserWithAllScalarData.csv

@@ -1,3 +1,3 @@
 "fe_users"
-,"uid","crdate","tstamp","username","password","usergroup","name","first_name","middle_name","last_name","address","telephone","email","title","zip","city","country","www","company","image","lastlogin","zone","privacy","terms_acknowledged","full_salutation","gender","date_of_birth","status","comments","terms_date_of_acceptance"
-,1,1546300800,1672531200,"max","luif3ui4t12","","Max M. Minimau","Max","Murri","Minimau","Near the heating 4","+49 1111 1233456-78","max@example.com","Head of fur","01234","Kattingen","United States of CAT","www.example.com","Cat Scans Inc.","",1648922400,"NRW",1,1,"Welcome, Max MM!",2,1648857600,2,"Here we go!",1716000000
+,"uid","crdate","tstamp","username","password","usergroup","name","first_name","middle_name","last_name","address","telephone","email","title","zip","city","country","www","company","image","lastlogin","zone","privacy","terms_acknowledged","full_salutation","gender","date_of_birth","status","comments","terms_date_of_acceptance","privacy_date_of_acceptance"
+,1,1546300800,1672531200,"max","luif3ui4t12","","Max M. Minimau","Max","Murri","Minimau","Near the heating 4","+49 1111 1233456-78","max@example.com","Head of fur","01234","Kattingen","United States of CAT","www.example.com","Cat Scans Inc.","",1648922400,"NRW",1,1,"Welcome, Max MM!",2,1648857600,2,"Here we go!",1716000000,1713000000

Tests/Functional/Domain/Repository/FrontendUserRepositoryTest.php

@@ -72,6 +72,7 @@ public function findByUidForExistingRecordReturnsModelWithAllScalarData(): void
         self::assertSame('Cat Scans Inc.', $model->getCompany());
         self::assertEquals(new \DateTime('2022-04-02T18:00'), $model->getLastLogin());
         self::assertTrue($model->getPrivacy());
+        self::assertEquals(new \DateTime('2024-04-13T09:20'), $model->getPrivacyDateOfAcceptance());
         self::assertTrue($model->hasTermsAcknowledged());
         self::assertEquals(new \DateTime('2024-05-18T02:40'), $model->getTermsDateOfAcceptance());
         self::assertSame('NRW', $model->getZone());

Tests/Unit/Domain/Model/FrontendUserTest.php

@@ -671,6 +671,25 @@ public function setPrivacySetsPrivacy(): void
         self::assertTrue($this->subject->getPrivacy());
     }
 
+    /**
+     * @test
+     */
+    public function getPrivacyDateOfAcceptanceInitiallyReturnsNull(): void
+    {
+        self::assertNull($this->subject->getPrivacyDateOfAcceptance());
+    }
+
+    /**
+     * @test
+     */
+    public function setPrivacyDateOfAcceptanceSetsPrivacyDateOfAcceptance(): void
+    {
+        $model = new \DateTime();
+        $this->subject->setPrivacyDateOfAcceptance($model);
+
+        self::assertSame($model, $this->subject->getPrivacyDateOfAcceptance());
+    }
+
     /**
      * @test
      */

ext_tables.sql

@@ -7,6 +7,7 @@ CREATE TABLE fe_users (
 	date_of_birth int(11) DEFAULT '0' NOT NULL,
 	zone varchar(45) DEFAULT '' NOT NULL,
 	privacy tinyint(1) unsigned DEFAULT '0' NOT NULL,
+	privacy_date_of_acceptance int(11) unsigned DEFAULT '0' NOT NULL,
 	terms_acknowledged tinyint(1) unsigned DEFAULT '0' NOT NULL,
 	terms_date_of_acceptance int(11) unsigned DEFAULT '0' NOT NULL,
 	status tinyint(1) unsigned DEFAULT '0' NOT NULL,