Merge pull request #12 from TomHAnderson/hotfix/Error

Force www-data user; add exception handling to mutation

Author: TomHAnderson

.docker/apache2.conf

@@ -112,10 +112,8 @@ MaxKeepAliveRequests 100
 #
 KeepAliveTimeout 5
 
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
+User www-data
+Group www-data
 
 #
 # HostnameLookups: Log the names of clients or just their IP addresses

Dockerfile

@@ -75,8 +75,10 @@ RUN composer install --no-dev
 RUN touch /var/www/storage/logs/laravel.log && \
   rm /var/www/storage/logs/laravel.log && \
   touch /var/www/storage/logs/laravel.log
-RUN chgrp -R www-data storage bootstrap/cache database/database.sqlite
-RUN chmod -R ug+rwx storage bootstrap/cache database/database.sqlite
+RUN chgrp -R www-data storage bootstrap/cache
+RUN chmod -R ug+rwx storage bootstrap/cache
+RUN chgrp -R www-data database/database.sqlite
+RUN chmod -R ug+rwx database/database.sqlite
 
 # Expose port
 EXPOSE 8080

app/GraphQL/Mutation/Artist/Create.php

@@ -9,7 +9,9 @@
 use App\GraphQL\Field;
 use Doctrine\Laminas\Hydrator\DoctrineObject;
 use Doctrine\ORM\EntityManager;
+use GraphQL\Error\Error;
 use GraphQL\Type\Definition\ResolveInfo;
+use Throwable;
 
 class Create implements Field
 {
@@ -33,7 +35,12 @@ public static function getDefinition(
 
                 $driver->get(DoctrineObject::class)->hydrate($args['values'], $artist);
                 $driver->get(EntityManager::class)->persist($artist);
-                $driver->get(EntityManager::class)->flush();
+
+                try {
+                    $driver->get(EntityManager::class)->flush();
+                } catch (Throwable $e) {
+                    throw new Error($e->getMessage());
+                }
 
                 return $artist;
             },