Putting mailer into consistent state with external changes

rootpd · rootpd · commit 54a34a204258 · 2018-02-28T09:16:09.000+01:00
remp/remp#187
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .vscode
 .env
+
 docker-compose.override.yml
 .yarn-error.log
 .DS_Store
diff --git a/Docker/php/remp.sh b/Docker/php/remp.sh
@@ -5,19 +5,30 @@ cd ${APP_NAME}
 if [ ! -f ".env" ]
 then
     cp .env.example .env
+
     composer install
+
     yarn install --no-bin-links
     npm rebuild node-sass optipng-bin --no-bin-links
     chmod -R u+x node_modules
     yarn run dev
+
     if [ -f "artisan" ]
     then
         php artisan migrate
         php artisan db:seed
         php artisan key:generate
+        php artisan ide-helper:generate
+        php artisan ide-helper:meta
         php artisan ide-helper:models
+
+        php artisan list | grep "jwt:secret" > /dev/null
+        if [ $? -eq "0" ]; then
+            php artisan jwt:secret
+        fi
     elif [ -f "bin/command.php" ]
     then
+        cp app/config/config.local.neon.example app/config/config.local.neon
         php bin/command.php migrate:migrate
         php bin/command.php seed:db
         php bin/command.php seed:demo
diff --git a/Mailer/app/commands/DatabaseSeedCommand.php b/Mailer/app/commands/DatabaseSeedCommand.php
@@ -3,6 +3,7 @@
 namespace Remp\MailerModule\Commands;
 
 use Remp\MailerModule\Repository\ConfigsRepository;
+use Remp\MailerModule\Repository\ListCategoriesRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -11,11 +12,15 @@ class DatabaseSeedCommand extends Command
 {
     private $configsRepository;
 
+    private $listCategoriesRepository;
+
     public function __construct(
-        ConfigsRepository $configsRepository
+        ConfigsRepository $configsRepository,
+        ListCategoriesRepository $listCategoriesRepository
     ) {
         parent::__construct();
         $this->configsRepository = $configsRepository;
+        $this->listCategoriesRepository = $listCategoriesRepository;
     }
 
     protected function configure()
@@ -54,6 +59,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(" * Config <info>{$configValue['0']}</info> exists");
             }
         }
+
+        $listCategories = [
+            ['title' => 'Newsletters', 'sorting' => 100],
+            ['title' => 'System', 'sorting' => 999],
+        ];
+        $output->writeln('Newsletter list categories:');
+        foreach ($listCategories as $category) {
+            if ($this->listCategoriesRepository->getTable()->where(['title' => $category['title']])->count('*') > 0) {
+                $output->writeln(" * Newsletter list <info>{$category['title']}</info> exists");
+                continue;
+            }
+            $this->listCategoriesRepository->add($category['title'], $category['sorting']);
+            $output->writeln(" * Newsletter list <info>{$category['title']}</info> created");
+        }
+
         $output->writeln('<info>OK!</info>');
     }
 }
diff --git a/Mailer/app/commands/DemoSeedCommand.php b/Mailer/app/commands/DemoSeedCommand.php
@@ -54,10 +54,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // list category
         $output->write('List categories: ');
         /** @var ActiveRow $category */
-        $category = $this->listCategoriesRepository->findBy('title', 'DEMO newsletters');
+        $category = $this->listCategoriesRepository->findBy('title', 'Newsletters');
         if (!$category) {
             $category = $this->listCategoriesRepository->insert([
-                'title' => 'DEMO newsletters',
+                'title' => 'Newsletters',
                 'sorting' => 100,
                 'created_at' => new \DateTime(),
             ]);
diff --git a/Mailer/app/commands/EmailChangedWorkerCommand.php b/Mailer/app/commands/EmailChangedWorkerCommand.php
@@ -2,12 +2,9 @@
 
 namespace Remp\MailerModule\Commands;
 
-use Nette\Database\Table\ActiveRow;
 use Nette\Utils\Json;
 use Remp\MailerModule\Broker\ConsumerFactory;
-use Remp\MailerModule\Repository\ListsRepository;
 use Remp\MailerModule\Repository\UserSubscriptionsRepository;
-use Remp\MailerModule\User\IUser;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -20,17 +17,13 @@ class EmailChangedWorkerCommand extends Command
 
     private $userSubscriptionsRepository;
 
-    private $userProvider;
-
     public function __construct(
         ConsumerFactory $consumerFactory,
-        UserSubscriptionsRepository $userSubscriptionsRepository,
-        IUser $userProvider
+        UserSubscriptionsRepository $userSubscriptionsRepository
     ) {
         parent::__construct();
         $this->consumerFactory = $consumerFactory;
         $this->userSubscriptionsRepository = $userSubscriptionsRepository;
-        $this->userProvider = $userProvider;
     }
 
     /**
diff --git a/Mailer/app/config/config.local.neon.example b/Mailer/app/config/config.local.neon.example
@@ -0,0 +1,20 @@
+services:
+    # This is a reference IUser implementation.
+    # You should make your own implementation against your CRM system and register it here.
+    - Remp\MailerModule\User\Dummy
+
+    # To be able to send an email, you need to provide at least one ISegment implementation
+    # You should make your own implementation against your CRM system and register it here.
+    segmentAgreggator:
+        setup:
+            - register(Remp\MailerModule\Segment\Dummy())
+
+# local_configs override DBs configs records.
+local_configs:
+
+    # Configuring usage of mailhog for local development
+    remp_mailermodule_mailer_smtpmailer_host: mailhog
+    remp_mailermodule_mailer_smtpmailer_port: 1025
+    remp_mailermodule_mailer_smtpmailer_username: ''
+    remp_mailermodule_mailer_smtpmailer_password: ''
+    remp_mailermodule_mailer_smtpmailer_secure: ''
diff --git a/Mailer/app/forms/ListFormFactory.php b/Mailer/app/forms/ListFormFactory.php
@@ -31,15 +31,17 @@ public function create()
         $form->addProtection();
 
         $categoryPairs = $this->listCategoriesRepository->all()->fetchPairs('id', 'title');
-        $form->addSelect('mail_type_category_id', 'Category', $categoryPairs);
+        $form
+            ->addSelect('mail_type_category_id', 'Category', $categoryPairs)
+            ->setRequired('Category is required');
 
         $form->addSelect('priority', 'Priority', [10 => 'High', 100 => 'Normal', 1000 => 'Low']);
 
         $form->addText('code', 'Code')
-            ->setRequired('Required');
+            ->setRequired('Code is required');
 
         $form->addText('title', 'Title')
-            ->setRequired('Required');
+            ->setRequired('Title is required');
 
         $form->addTextArea('description', 'Description')
             ->setAttribute('rows', 3);
diff --git a/Mailer/app/forms/TemplateFormFactory.php b/Mailer/app/forms/TemplateFormFactory.php
@@ -51,29 +51,30 @@ public function create($id)
         $form->addHidden('id', $id);
 
         $form->addText('name', 'Name')
-            ->setRequired('Required');
+            ->setRequired('Name is required');
 
         if (isset($id) && $count > 0) {
             $form->addText('code', 'Code')
-                ->setRequired('Required')
+                ->setRequired('Code is required')
                 ->setDisabled();
         } else {
             $form->addText('code', 'Code')
-                ->setRequired('Required');
+                ->setRequired('Code is required');
         }
 
         $form->addText('description', 'Description');
 
         $form->addSelect('mail_layout_id', 'Layout', $this->layoutsRepository->all()->fetchPairs('id', 'name'));
 
-        $form->addSelect('mail_type_id', 'Newsletter list', $this->listsRepository->all()->fetchPairs('id', 'title'));
+        $form->addSelect('mail_type_id', 'Newsletter list', $this->listsRepository->all()->fetchPairs('id', 'title'))
+            ->setRequired('Newsletter list is required');
 
         $form->addText('from', 'From')
             ->addRule(FormRules::ADVANCED_EMAIL, 'Enter correct email')
-            ->setRequired('Required');
+            ->setRequired('From field is required');
 
         $form->addText('subject', 'Subject')
-            ->setRequired('Required');
+            ->setRequired('Subject is required');
 
         $form->addTextArea('mail_body_text', 'Text version')
             ->setAttribute('rows', 3);
diff --git a/Mailer/app/models/Repositories/ListCategoriesRepository.php b/Mailer/app/models/Repositories/ListCategoriesRepository.php
@@ -2,6 +2,7 @@
 
 namespace Remp\MailerModule\Repository;
 
+use Nette\Utils\DateTime;
 use Remp\MailerModule\Repository;
 
 class ListCategoriesRepository extends Repository
@@ -12,4 +13,13 @@ public function all()
     {
         return $this->getTable()->order('sorting ASC');
     }
+
+    public function add($title, $sorting)
+    {
+        return $this->getTable()->insert([
+            'title' => $title,
+            'sorting' => $sorting,
+            'created_at' => new DateTime(),
+        ]);
+    }
 }
diff --git a/Mailer/app/models/Segments/Dummy.php b/Mailer/app/models/Segments/Dummy.php
@@ -0,0 +1,29 @@
+<?php
+namespace Remp\MailerModule\Segment;
+
+class Dummy implements ISegment
+{
+    const PROVIDER_ALIAS = 'dummy-segment';
+
+    public function provider()
+    {
+        return [static::PROVIDER_ALIAS => $this];
+    }
+
+    public function list()
+    {
+        return [
+            [
+                'name' => 'Dummy segment',
+                'provider' => static::PROVIDER_ALIAS,
+                'code' => 'dummy-segment',
+                'group' => 'dummy',
+            ],
+        ];
+    }
+
+    public function users($segment)
+    {
+        return [1,2];
+    }
+}
diff --git a/Mailer/app/models/Users/Dummy.php b/Mailer/app/models/Users/Dummy.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Remp\MailerModule\User;
+
+class Dummy implements IUser
+{
+    public function list(array $userIds, $page)
+    {
+        return array_intersect($userIds, [
+            1 => ['id' => 1, 'email' => 'foo@example.com'],
+            2 => ['id' => 2, 'email' => 'bar@example.com'],
+        ]);
+    }
+}
diff --git a/Mailer/migrations/20170829092343_initial_migration.php b/Mailer/migrations/20170829092343_initial_migration.php
@@ -70,10 +70,12 @@ public function change()
             ->addColumn('mail_body_text', 'text')
             ->addColumn('mail_body_html', 'text')
             ->addColumn('mail_layout_id', 'integer', ['null' => true])
+            ->addColumn('copy_from', 'integer', ['null' => true])
             ->addColumn('autologin', 'integer')
             ->addColumn('mail_type_id', 'integer')
             ->addForeignKey('mail_layout_id', 'mail_layouts', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
             ->addForeignKey('mail_type_id', 'mail_types', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
+            ->addForeignKey('copy_from', 'mail_templates', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
             ->addTimestamps()
             ->create();
 
@@ -129,7 +131,7 @@ public function change()
             ->addColumn('user_id', 'integer')
             ->addColumn('user_email', 'integer')
             ->addColumn('mail_type_id', 'integer')
-            ->addColumn('susbcribed', 'boolean')
+            ->addColumn('subscribed', 'boolean')
             ->addColumn('mail_type_variant_id', 'integer', ['null' => true])
             ->addForeignKey('mail_type_id', 'mail_types', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
             ->addForeignKey('mail_type_variant_id', 'mail_type_variants', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
diff --git a/Mailer/migrations/20170829092344_mail_logs.php b/Mailer/migrations/20170829092344_mail_logs.php
@@ -0,0 +1,29 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class MailLogs extends AbstractMigration
+{
+    public function change()
+    {
+        $this->table('mail_logs')
+            ->addColumn('email', 'string')
+            ->addColumn('subject', 'string', ['null' => true])
+            ->addColumn('mail_template_id', 'integer', ['null' => true])
+            ->addColumn('mail_job_id', 'integer', ['null' => true])
+            ->addColumn('mail_sender_id', 'string', ['null' => true])
+            ->addColumn('delivered_at', 'datetime', ['null' => true])
+            ->addColumn('dropped_at', 'datetime', ['null' => true])
+            ->addColumn('spam_complained_at', 'datetime', ['null' => true])
+            ->addColumn('hard_bounced_at', 'datetime', ['null' => true])
+            ->addColumn('clicked_at', 'datetime', ['null' => true])
+            ->addColumn('opened_at', 'datetime', ['null' => true])
+            ->addColumn('attachment_size', 'datetime', ['null' => true])
+            ->addTimestamps()
+
+            ->addForeignKey('mail_template_id', 'mail_templates', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
+            ->addForeignKey('mail_job_id', 'mail_jobs', 'id', ['delete' => 'RESTRICT', 'update' => 'CASCADE'])
+            ->create();
+
+    }
+}
diff --git a/Mailer/migrations/20180121182159_add_public_listing_to_mailtemplates.php b/Mailer/migrations/20180121182159_add_public_listing_to_mailtemplates.php
@@ -0,0 +1,14 @@
+<?php
+
+
+use Phinx\Migration\AbstractMigration;
+
+class AddPublicListingToMailtemplates extends AbstractMigration
+{
+    public function change()
+    {
+        $this->table('mail_types')
+            ->addColumn('public_listing', 'boolean', ['null' => false, 'default' => true, 'after' => 'is_public'])
+            ->update();
+    }
+}
diff --git a/Mailer/migrations/20180124064156_mail_user_subscription_types.php b/Mailer/migrations/20180124064156_mail_user_subscription_types.php
@@ -0,0 +1,31 @@
+<?php
+
+
+use Phinx\Migration\AbstractMigration;
+
+class MailUserSubscriptionTypes extends AbstractMigration
+{
+    public function change()
+    {
+        $this->table('mail_user_subscription_variants')
+            ->addColumn('mail_user_subscription_id', 'integer', ['null' => false])
+            ->addColumn('mail_type_variant_id', 'integer', ['null' => false])
+            ->addColumn('created_at', 'datetime', ['null' => false])
+            ->addForeignKey('mail_user_subscription_id', 'mail_user_subscriptions')
+            ->addForeignKey('mail_type_variant_id', 'mail_type_variants')
+            ->addIndex(['mail_user_subscription_id', 'mail_type_variant_id'], ['unique' => true])
+            ->create();
+
+        $query = "INSERT INTO mail_user_subscription_variants (mail_user_subscription_id, mail_type_variant_id, created_at)
+          SELECT id,mail_type_variant_id,NOW() FROM mail_user_subscriptions WHERE mail_type_variant_id IS NOT NULL";
+        $this->query($query);
+
+        $this->table('mail_user_subscriptions')
+            ->renameColumn('mail_type_variant_id', 'remove_mail_type_variant_id')
+            ->update();
+
+        $this->table('mail_types')
+            ->addColumn('is_multi_variant', 'boolean', ['default' => false, 'null' => false, 'after' => 'auto_subscribe'])
+            ->update();
+    }
+}
diff --git a/Mailer/migrations/20180206143842_auto_autologin.php b/Mailer/migrations/20180206143842_auto_autologin.php
@@ -0,0 +1,13 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AutoAutologin extends AbstractMigration
+{
+    public function change()
+    {
+        $this->table('mail_templates')
+            ->changeColumn('autologin', 'boolean', ['null' => false, 'default' => true])
+            ->update();
+    }
+}
diff --git a/install.sh b/install.sh
@@ -4,5 +4,6 @@ make docker-build
 cd ..
 rm -f Beam/.env
 rm -f Mailer/.env
+rm -f Mailer/config/config.local.neon
 rm -f Sso/.env
 docker-compose up -d

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Remp\MailerModule\Repository;`
`4`	`4`
	`5`	`+use Nette\Utils\DateTime;`
`5`	`6`	`use Remp\MailerModule\Repository;`
`6`	`7`
`7`	`8`	`class ListCategoriesRepository extends Repository`
`@@ -12,4 +13,13 @@ public function all()`
`12`	`13`	`{`
`13`	`14`	`return $this->getTable()->order('sorting ASC');`
`14`	`15`	`}`
	`16`	`+`
	`17`	`+ public function add($title, $sorting)`
	`18`	`+ {`
	`19`	`+ return $this->getTable()->insert([`
	`20`	`+ 'title' => $title,`
	`21`	`+ 'sorting' => $sorting,`
	`22`	`+ 'created_at' => new DateTime(),`
	`23`	`+ ]);`
	`24`	`+ }`
`15`	`25`	`}`