Merge pull request #118 from swindonmakers/castaway/hotfix_reminder_e…

…mails Do not force recreation of reminder emails
swindonmakers · Feb 16, 2025 · 52b1de5 · 52b1de5
2 parents 6441b64 + 996f25f
commit 52b1de5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/AccessSystem/Schema/Result/Communication.pm b/lib/AccessSystem/Schema/Result/Communication.pm
@@ -45,7 +45,7 @@ __PACKAGE__->add_columns(
         is_nullable => 1,
     },
     );
-__PACKAGE__->set_primary_key('person_id', 'type');
+__PACKAGE__->set_primary_key('person_id', 'created_on');
 
 __PACKAGE__->belongs_to('person', 'AccessSystem::Schema::Result::Person', 'person_id' );
 

diff --git a/lib/AccessSystem/Schema/Result/Person.pm b/lib/AccessSystem/Schema/Result/Person.pm
@@ -534,7 +534,7 @@ sub create_payment {
                 'Swindon Makerspace membership check',
                 'reminder_email',
                 { paid_date => $paid_date, expires_date => $expires_date },
-                1);
+                );
         }
         return;
     }
@@ -644,8 +644,11 @@ sub create_communication {
     my $check_exists = $self->communications_rs->search_rs({
         type => $type,
     });
-    if($check_exists->count == 1 && !$force) {
-        return $check_exists->first;
+    if($check_exists->count == 1) {
+        if(!$force) {
+            return $check_exists->first;
+        }
+        $check_exists->delete;
     }
 
     # templates in $ENV{CATALYST_HOME}/root/src/emails/<type>/<type>.txt / .html