Fix a bad template variable in SendNewletters workflow activity, bug #10953

docs/changelog/7.x.x.txt

@@ -34,6 +34,7 @@
  - fixed #10941: New user profile fields with unfortunate names
  - fixed #10955: Story Manager: unable to import packages
  - fixed #10970: Newsletter Asset: no subscribe link
+ - fixed #10953: SendNewsletters Activity: Invalid template variable
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread

lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm

@@ -157,7 +157,8 @@ Store subscription information for a user into the database.
 
 =head3 $subscriptions
 
-A string containing newline separated subscriptions for a user.
+A string containing newline separated subscriptions for a user.  A "subscription" is the
+fieldId of an asset metadata field joined with the metadata value with a tilde "~".
 
 =head3 $userId
 

lib/WebGUI/Workflow/Activity/SendNewsletters.pm

@@ -81,7 +81,7 @@ sub execute {
         $eh->info("Getting user $userId");
         my $user = WebGUI::User->new($self->session, $userId);
         next if ($user->isVisitor);
-        my $emailAddress = $user->profileField("email");
+        my $emailAddress = $user->get("email");
         next if ($emailAddress eq "");
 
 
@@ -130,7 +130,7 @@ sub execute {
             push(@threadLoop, {
                 title       => $thread->getTitle,
                 synopsis    => $thread->get("synopsis"),
-                body        => $thread->get("body"),
+                body        => $thread->get("content"),
                 url         => $siteurl.$thread->getUrl,
                 });
         }

t/Workflow/Activity/SendNewsletters.t

@@ -0,0 +1,135 @@
+# vim:syntax=perl
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../../lib";
+use Test::More;
+use Test::Deep;
+use Data::Dumper;
+use WebGUI::Test; # Must use this before any other WebGUI modules
+use WebGUI::Session;
+use Test::MockObject;
+use Test::MockObject::Extends;
+
+#----------------------------------------------------------------------------
+# Init
+my $session         = WebGUI::Test->session;
+
+
+#----------------------------------------------------------------------------
+# Tests
+
+plan tests => 1;        # Increment this number for each test you create
+
+##Disable sending email
+my $sendmock = Test::MockObject->new( {} );
+$sendmock->set_isa('WebGUI::Mail::Send');
+$sendmock->set_true('addText', 'send', 'addHeaderField', 'addHtml', 'queue', 'addFooter');
+local *WebGUI::Mail::Send::create;
+$sendmock->fake_module('WebGUI::Mail::Send',
+    create => sub { return $sendmock },
+);
+
+##Create Assets;
+my $home = WebGUI::Asset->getDefault($session);
+my $versionTag = WebGUI::VersionTag->getWorking($session);
+
+                 #1234567890123456789012#
+my $templateId = 'NEWSLETTER_TEMPLATE___';
+
+my $templateMock = Test::MockObject->new({});
+$templateMock->set_isa('WebGUI::Asset::Template');
+$templateMock->set_always('getId', $templateId);
+my $templateVars;
+$templateMock->mock('process', sub { $templateVars = $_[1]; } );
+
+my $cs = $home->addChild({
+    className            => 'WebGUI::Asset::Wobject::Collaboration::Newsletter',
+    title                => 'Test Newsletter',
+    enablePostMetaData   => 1,
+    newsletterTemplateId => $templateId, ##Mocked asset for doing template variable checks
+    description          => 'Fans of Shawshank Inmates',
+    newsletterHeader     => 'newsletter header',
+    newsletterFooter     => 'newsletter footer',
+});
+
+my $thread = $cs->addChild({
+    className => 'WebGUI::Asset::Post::Thread',
+    title     => 'Test Thread',
+    content   => 'This is the content',
+    synopsis  => 'This is the synopsis',
+}, undef, undef, {skipAutoCommitWorkflows => 1,});
+
+$versionTag->commit;
+WebGUI::Test->tagsToRollback($versionTag);
+
+##Setup metadata
+$session->setting->set('metaDataEnabled', 1);
+$cs->addMetaDataField('new', 'newsletterCategory', '', '', 'radioList',
+    join("\n", qw/Andy Red Boggs/),
+);
+
+my $metaDataFields = buildNameIndex($cs->getMetaDataFields);
+$thread->updateMetaData($metaDataFields->{newsletterCategory}, 'Andy');
+
+##Create subscriber user
+my $subscriber = WebGUI::User->create($session);
+$subscriber->update({ 'email', 'going@nowhere.com' });
+WebGUI::Test->usersToDelete($subscriber);
+$cs->setUserSubscriptions($metaDataFields->{newsletterCategory}."~Andy", $subscriber->getId);
+$session->db->write(<<EOSQL, [ time()-24*60*60, $cs->getId, $subscriber->getId ]);
+update Newsletter_subscriptions set lastTimeSent=? where assetId=? and userId=?
+EOSQL
+
+##Setup the workflow activity to run
+my $activity = Test::MockObject::Extends->new( 'WebGUI::Workflow::Activity::SendNewsletters' );
+$activity->set_always('session', $session);
+$activity->set_always('getTTL', 60);
+$activity->set_always('COMPLETE', 'complete');
+
+{
+    WebGUI::Test->mockAssetId($templateId, $templateMock);
+    $activity->execute();
+    cmp_deeply(
+        $templateVars,
+        {
+            title       => 'Test Newsletter',
+            description => 'Fans of Shawshank Inmates',
+            footer      => 'newsletter footer',
+            header      => 'newsletter header',
+            thread_loop => [
+                {
+                    body     => 'This is the content',
+                    synopsis => 'This is the synopsis',
+                    title    => 'Test Thread',
+                    url      => re('test-newsletter/test-thread'),
+                },
+            ],
+        }
+    );
+    WebGUI::Test->unmockAssetId($templateId);
+}
+
+foreach my $metadataId (keys %{ $cs->getMetaDataFields }) {
+    $cs->deleteMetaDataField($metadataId);
+}
+
+sub buildNameIndex {
+    my ($fidStruct) = @_;
+    my $nameStruct;
+    foreach my $field ( values %{ $fidStruct } ) {
+        $nameStruct->{ $field->{fieldName} } = $field->{fieldId};
+    }
+    return $nameStruct;
+}
+
+#vim:ft=perl