updates

Make sure the change the permissions to the var folder everytime we restart

.gitignore

@@ -5,6 +5,7 @@
 /public/bundles/
 /var/
 /vendor/
+/migrations/
 ###< symfony/framework-bundle ###
 
 ###> phpunit/phpunit ###

Dockerfile

@@ -57,7 +57,7 @@ RUN crontab /etc/cron.d/get-audio
 RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-scripts --no-dev --optimize-autoloader
 RUN mkdir /data
 
-RUN mkdir -p /var/www/html/var/cache
+RUN mkdir -p /var/www/html/var/cache/prod
 RUN mkdir -p /var/www/html/var/log
 
 RUN chown -R 33:33 /var/www/html /data

bin/entrypoint.sh

@@ -2,5 +2,7 @@
 # Start the cron service in the background
 service cron start
 
+chown -R www-data:www-data /var/www/html/var
+
 # Execute the default Docker CMD (which starts Apache in the foreground)
 exec "$@"

install.php

@@ -7,12 +7,12 @@ shell_exec("COMPOSE_ALLOW_SUPERUSER=1 composer update");
 //`symfony console asset-map:compile");
 
 print "Creating database schema".PHP_EOL;
-shell_exec("symfony console doctrine:database:create");
+shell_exec("symfony console doctrine:database:create --if-not-exists");
 
 print "Updating migrations and setting permissions for data folder".PHP_EOL;
-shell_exec("symfony console doctrine:migrations:migrate --no-interaction");
+shell_exec("symfony console doctrine:schema:create");
 
-shell_exec("chown -R www-data:www-data /data");
+shell_exec("chown -R www-data:www-data /data /var/www/html/var/cache");
 
 // import reference material
 

migrations/Version20240505234804.php

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240505234804 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE user (id BLOB NOT NULL --(DC2Type:uuid)
-        , email VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json)
-        , password VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_IDENTIFIER_EMAIL ON user (email)');
-        $this->addSql('CREATE TABLE messenger_messages (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, body CLOB NOT NULL, headers CLOB NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , available_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , delivered_at DATETIME DEFAULT NULL --(DC2Type:datetime_immutable)
-        )');
-        $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0 ON messenger_messages (queue_name)');
-        $this->addSql('CREATE INDEX IDX_75EA56E0E3BD61CE ON messenger_messages (available_at)');
-        $this->addSql('CREATE INDEX IDX_75EA56E016BA31DB ON messenger_messages (delivered_at)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE user');
-        $this->addSql('DROP TABLE messenger_messages');
-    }
-}

migrations/Version20240513011501.php

@@ -1,62 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240513011501 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE bible (id BLOB NOT NULL --(DC2Type:uuid)
-        , book VARCHAR(255) NOT NULL, chapter INTEGER NOT NULL, verse INTEGER NOT NULL, content CLOB DEFAULT NULL, book_index INTEGER NOT NULL, label VARCHAR(20) DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE TABLE note (id BLOB NOT NULL --(DC2Type:uuid)
-        , speaker_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , series_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , user_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , title VARCHAR(255) NOT NULL, date DATE NOT NULL, passage VARCHAR(255) NOT NULL, refs CLOB DEFAULT NULL --(DC2Type:json)
-        , text CLOB DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_CFBDFA14D04A0F27 FOREIGN KEY (speaker_id) REFERENCES speaker (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_CFBDFA145278319C FOREIGN KEY (series_id) REFERENCES series (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_CFBDFA14A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_CFBDFA14D04A0F27 ON note (speaker_id)');
-        $this->addSql('CREATE INDEX IDX_CFBDFA145278319C ON note (series_id)');
-        $this->addSql('CREATE INDEX IDX_CFBDFA14A76ED395 ON note (user_id)');
-        $this->addSql('CREATE TABLE reference (id BLOB NOT NULL --(DC2Type:uuid)
-        , type VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, label VARCHAR(255) NOT NULL, ndx INTEGER NOT NULL, content CLOB DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE TABLE series (id BLOB NOT NULL --(DC2Type:uuid)
-        , user_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , template_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , name VARCHAR(255) NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_3A10012DA76ED395 FOREIGN KEY (user_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_3A10012D5DA0FB8 FOREIGN KEY (template_id) REFERENCES template (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_3A10012DA76ED395 ON series (user_id)');
-        $this->addSql('CREATE INDEX IDX_3A10012D5DA0FB8 ON series (template_id)');
-        $this->addSql('CREATE TABLE speaker (id BLOB NOT NULL --(DC2Type:uuid)
-        , user_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , name VARCHAR(255) NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_7B85DB61A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_7B85DB61A76ED395 ON speaker (user_id)');
-        $this->addSql('CREATE TABLE template (id BLOB NOT NULL --(DC2Type:uuid)
-        , user_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , name VARCHAR(255) NOT NULL, content CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_97601F83A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_97601F83A76ED395 ON template (user_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE bible');
-        $this->addSql('DROP TABLE note');
-        $this->addSql('DROP TABLE reference');
-        $this->addSql('DROP TABLE series');
-        $this->addSql('DROP TABLE speaker');
-        $this->addSql('DROP TABLE template');
-    }
-}

migrations/Version20240513161129.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240513161129 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__reference AS SELECT id, type, name, label, ndx, content FROM reference');
-        $this->addSql('DROP TABLE reference');
-        $this->addSql('CREATE TABLE reference (id BLOB NOT NULL --(DC2Type:uuid)
-        , type VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, label VARCHAR(255) NOT NULL, ndx INTEGER DEFAULT NULL, content CLOB DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('INSERT INTO reference (id, type, name, label, ndx, content) SELECT id, type, name, label, ndx, content FROM __temp__reference');
-        $this->addSql('DROP TABLE __temp__reference');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__reference AS SELECT id, type, name, label, ndx, content FROM reference');
-        $this->addSql('DROP TABLE reference');
-        $this->addSql('CREATE TABLE reference (id BLOB NOT NULL --(DC2Type:uuid)
-        , type VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, label VARCHAR(255) NOT NULL, ndx INTEGER NOT NULL, content CLOB DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('INSERT INTO reference (id, type, name, label, ndx, content) SELECT id, type, name, label, ndx, content FROM __temp__reference');
-        $this->addSql('DROP TABLE __temp__reference');
-    }
-}

migrations/Version20240527010736.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240527010736 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE note ADD COLUMN recording VARCHAR(255) DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__note AS SELECT id, speaker_id, series_id, user_id, title, date, passage, refs, text FROM note');
-        $this->addSql('DROP TABLE note');
-        $this->addSql('CREATE TABLE note (id BLOB NOT NULL --(DC2Type:uuid)
-        , speaker_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , series_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , user_id BLOB DEFAULT NULL --(DC2Type:uuid)
-        , title VARCHAR(255) NOT NULL, date DATE NOT NULL, passage VARCHAR(255) NOT NULL, refs CLOB DEFAULT NULL --(DC2Type:json)
-        , text CLOB DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_CFBDFA14D04A0F27 FOREIGN KEY (speaker_id) REFERENCES speaker (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_CFBDFA145278319C FOREIGN KEY (series_id) REFERENCES series (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_CFBDFA14A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO note (id, speaker_id, series_id, user_id, title, date, passage, refs, text) SELECT id, speaker_id, series_id, user_id, title, date, passage, refs, text FROM __temp__note');
-        $this->addSql('DROP TABLE __temp__note');
-        $this->addSql('CREATE INDEX IDX_CFBDFA14D04A0F27 ON note (speaker_id)');
-        $this->addSql('CREATE INDEX IDX_CFBDFA145278319C ON note (series_id)');
-        $this->addSql('CREATE INDEX IDX_CFBDFA14A76ED395 ON note (user_id)');
-    }
-}

migrations/Version20240622233923.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240622233923 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE user ADD COLUMN meta_data CLOB DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, email, roles, password, name FROM user');
-        $this->addSql('DROP TABLE user');
-        $this->addSql('CREATE TABLE user (id BLOB NOT NULL --(DC2Type:uuid)
-        , email VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json)
-        , password VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('INSERT INTO user (id, email, roles, password, name) SELECT id, email, roles, password, name FROM __temp__user');
-        $this->addSql('DROP TABLE __temp__user');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_IDENTIFIER_EMAIL ON user (email)');
-    }
-}

migrations/Version20240717022017.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20240717022017 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE shared_note (id BLOB NOT NULL --(DC2Type:uuid)
-        , note_id BLOB NOT NULL --(DC2Type:uuid)
-        , owner_id BLOB NOT NULL --(DC2Type:uuid)
-        , shared_user_id BLOB NOT NULL --(DC2Type:uuid)
-        , PRIMARY KEY(id), CONSTRAINT FK_754B918C26ED0855 FOREIGN KEY (note_id) REFERENCES note (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_754B918C26ED0855 ON shared_note (note_id)');
-        $this->addSql('CREATE TABLE shared_series (id BLOB NOT NULL --(DC2Type:uuid)
-        , series_id BLOB NOT NULL --(DC2Type:uuid)
-        , owner_id BLOB NOT NULL --(DC2Type:uuid)
-        , shared_user_id BLOB NOT NULL --(DC2Type:uuid)
-        , PRIMARY KEY(id), CONSTRAINT FK_59E803195278319C FOREIGN KEY (series_id) REFERENCES series (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('CREATE INDEX IDX_59E803195278319C ON shared_series (series_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE shared_note');
-        $this->addSql('DROP TABLE shared_series');
-    }
-}

migrations/Version20260114224910.php

@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260114224910 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE user ADD COLUMN home_church_rss VARCHAR(255) DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__user AS SELECT id, email, roles, password, name, meta_data FROM user');
-        $this->addSql('DROP TABLE user');
-        $this->addSql('CREATE TABLE user (id BLOB NOT NULL --(DC2Type:uuid)
-        , email VARCHAR(180) NOT NULL, roles CLOB NOT NULL --(DC2Type:json)
-        , password VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, meta_data CLOB DEFAULT NULL --(DC2Type:json)
-        , PRIMARY KEY(id))');
-        $this->addSql('INSERT INTO user (id, email, roles, password, name, meta_data) SELECT id, email, roles, password, name, meta_data FROM __temp__user');
-        $this->addSql('DROP TABLE __temp__user');
-        $this->addSql('CREATE UNIQUE INDEX UNIQ_IDENTIFIER_EMAIL ON user (email)');
-    }
-}

migrations/Version20260217014215.php

@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20260217014215 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__messenger_messages AS SELECT id, body, headers, queue_name, created_at, available_at, delivered_at FROM messenger_messages');
-        $this->addSql('DROP TABLE messenger_messages');
-        $this->addSql('CREATE TABLE messenger_messages (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, body CLOB NOT NULL, headers CLOB NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , available_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , delivered_at DATETIME DEFAULT NULL --(DC2Type:datetime_immutable)
-        )');
-        $this->addSql('INSERT INTO messenger_messages (id, body, headers, queue_name, created_at, available_at, delivered_at) SELECT id, body, headers, queue_name, created_at, available_at, delivered_at FROM __temp__messenger_messages');
-        $this->addSql('DROP TABLE __temp__messenger_messages');
-        $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages (queue_name, available_at, delivered_at, id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TEMPORARY TABLE __temp__messenger_messages AS SELECT id, body, headers, queue_name, created_at, available_at, delivered_at FROM messenger_messages');
-        $this->addSql('DROP TABLE messenger_messages');
-        $this->addSql('CREATE TABLE messenger_messages (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, body CLOB NOT NULL, headers CLOB NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , available_at DATETIME NOT NULL --(DC2Type:datetime_immutable)
-        , delivered_at DATETIME DEFAULT NULL --(DC2Type:datetime_immutable)
-        )');
-        $this->addSql('INSERT INTO messenger_messages (id, body, headers, queue_name, created_at, available_at, delivered_at) SELECT id, body, headers, queue_name, created_at, available_at, delivered_at FROM __temp__messenger_messages');
-        $this->addSql('DROP TABLE __temp__messenger_messages');
-        $this->addSql('CREATE INDEX IDX_75EA56E016BA31DB ON messenger_messages (delivered_at)');
-        $this->addSql('CREATE INDEX IDX_75EA56E0E3BD61CE ON messenger_messages (available_at)');
-        $this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0 ON messenger_messages (queue_name)');
-    }
-}

setup.php

@@ -53,7 +53,7 @@ if ($getCreds) {
         $db_port = (isset($cmd['pgsql']) ? 5432 : 3306);
         $db_name = 'sermon_notes';
         $db_user = 'root';
-        $pwd = `openssl rand -base64 32 | tr -d '=' | tr -d '+'  | tr -d '/' | tr -d ' '`;
+        $pwd = shell_exec("openssl rand -base64 32 | tr -d '=' | tr -d '+'  | tr -d '/' | tr -d ' '");
         $db_password = substr($pwd, 0, 32);
 
         if (isset($cmd['pgsql'])) {

src/Entity/User.php

@@ -14,6 +14,7 @@ use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Validator\Constraints as Assert;
 
 #[ORM\Entity(repositoryClass: UserRepository::class)]
+#[ORM\Table(name: 'app_user')]
 #[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]
 class User implements UserInterface, PasswordAuthenticatedUserInterface, JsonSerializable
 {