Merge branch 'dev'

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="1ddb4e50-491a-44ba-87fc-5ef40f04cd18" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Envoy.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/Envoy.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Exports/Sheets/ProjectsSheet.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Exports/Sheets/ProjectsSheet.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Exports/Sheets/RecordsPerProjectSheet.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Exports/Sheets/RecordsPerProjectSheet.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/Feature/CreateProjectTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/Feature/CreateProjectTest.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -241,11 +243,12 @@
       <command value="composer codesniffer" />
       <command value="Start (Shell Scri...)" />
       <command value="npm run watch-poll" />
-      <command value="artisan migrate:fresh --seed" />
       <command value="Stop (Shell Scri...)" />
+      <command value="Build (Shell Scri...)" />
+      <command value="artisan migrate:fresh --seed" />
     </option>
   </component>
-  <component name="RunManager" selected="Shell Script.Stop">
+  <component name="RunManager" selected="Shell Script.Build">
     <configuration name="DeleteAndRestoreRecordTest.test_users_can_permanently_delete_multiple_records" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
       <TestRunner class="Tests\Feature\DeleteAndRestoreRecordTest" configuration_file="/var/www/html/phpunit.xml" file="$PROJECT_DIR$/tests/Feature/DeleteAndRestoreRecordTest.php" method="test_users_can_permanently_delete_multiple_records" scope="Method" />
       <method v="2" />
@@ -336,13 +339,13 @@
     <list>
       <item itemvalue="npm.eslint" />
       <item itemvalue="npm.prod" />
+      <item itemvalue="npm.watch-poll" />
       <item itemvalue="PHPUnit.phpunit.xml" />
       <item itemvalue="PHPUnit.DeleteAndRestoreRecordTest.test_users_can_permanently_delete_multiple_records" />
       <item itemvalue="PHPUnit.DeleteAndRestoreRecordTest.test_users_can_restore_multiple_records" />
       <item itemvalue="Shell Script.Stop" />
       <item itemvalue="Shell Script.Build" />
       <item itemvalue="Shell Script.Start" />
-      <item itemvalue="npm.watch-poll" />
     </list>
     <recent_temporary>
       <list>
@@ -369,6 +372,8 @@
       <workItem from="1635425565508" duration="935000" />
       <workItem from="1635499931607" duration="1065000" />
       <workItem from="1636121059643" duration="1488000" />
+      <workItem from="1636980508768" duration="2154000" />
+      <workItem from="1637749008739" duration="242000" />
     </task>
     <servers />
   </component>

app/Exports/Sheets/ProjectsSheet.php

@@ -30,7 +30,7 @@ class ProjectsSheet implements FromQuery, WithTitle, WithMapping, WithHeadings,
             $project->description,
             isset($project->start_date) ? Date::dateTimeToExcel($project->start_date) : null,
             isset($project->end_date) ? Date::dateTimeToExcel($project->end_date) : null,
-            "{$project->agreement?->name} - {$project->agreement?->url}",
+            optional($project->agreement)->name." - ".optional($project->agreement)->url,
             $project->users->implode('name', ', '),
             Date::dateTimeToExcel($project->created_at),
             Date::dateTimeToExcel($project->updated_at),

app/Exports/Sheets/RecordsPerProjectSheet.php

@@ -42,12 +42,12 @@ class RecordsPerProjectSheet implements
             $record->identifier,
             isset($record->start_date) ? Date::dateTimeToExcel($record->start_date) : null,
             isset($record->end_date) ? Date::dateTimeToExcel($record->end_date) : null,
-            $record->purpose?->purpose,
+            optional($record->purpose)->purpose,
             $record->processingCategories->implode('category', ', '),
             $record->note,
-            $record->dataCategory?->category,
-            $record->dataSubjectCategory?->category,
-            $record->lawfulBasis?->lawful_basis,
+            $record->dataCategory->category,
+            optional($record->dataSubjectCategory)->category,
+            optional($record->lawfulBasis)->lawful_basis,
             $record->ethics_approval ? 'TRUE' : 'FALSE',
             $record->accessCountries->map(function ($country) {
                 return sprintf(

tests/Feature/CreateProjectTest.php

@@ -38,7 +38,7 @@ class CreateProjectTest extends TestCase
 
         $this->post(route('projects.store'), Project::factory()->raw());
 
-        $project = Project::first();
+        $project = Project::firstOrFail();
 
         $this->assertDatabaseHas('project_user', [
             'project_id' => $project->id,