Merge tag 'v1.3.1' into staging

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.3.0"
+    ".": "1.3.1"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.1](https://github.com/accessibility-exchange/platform/compare/v1.3.0...v1.3.1) (2024-02-20)
+
+
+### Bug Fixes
+
+* preferred_contact_language column not found (resolves [#2145](https://github.com/accessibility-exchange/platform/issues/2145)) ([#2146](https://github.com/accessibility-exchange/platform/issues/2146)) ([cabc382](https://github.com/accessibility-exchange/platform/commit/cabc38206a2841fa5b30582193b87257ab6ca417))
+
 ## [1.3.0](https://github.com/accessibility-exchange/platform/compare/v1.2.5...v1.3.0) (2024-02-20)
 
 

composer.json

@@ -6,7 +6,7 @@
         "framework",
         "laravel"
     ],
-    "version": "1.3.0",
+    "version": "1.3.1",
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",

database/migrations/2024_02_01_180830_drop_communication_tools_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::dropIfExists('communication_tools');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::create('communication_tools', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->json('name');
+        });
+    }
+};

database/migrations/2024_02_06_143126_add_preferred_contact_language_to_projects_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->string('preferred_contact_language')
+                ->nullable()
+                ->after('preferred_contact_method');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->dropColumn('preferred_contact_language');
+        });
+    }
+};

database/migrations/2024_02_06_190129_add_preferred_contact_language_to_organizations_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('organizations', function (Blueprint $table) {
+            $table->string('preferred_contact_language')
+                ->nullable()
+                ->after('preferred_contact_method');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('organizations', function (Blueprint $table) {
+            $table->dropColumn('preferred_contact_language');
+        });
+    }
+};

database/migrations/2024_02_06_190140_add_preferred_contact_language_to_regulated_organizations_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('regulated_organizations', function (Blueprint $table) {
+            $table->string('preferred_contact_language')
+                ->nullable()
+                ->after('preferred_contact_method');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('regulated_organizations', function (Blueprint $table) {
+            $table->dropColumn('preferred_contact_language');
+        });
+    }
+};

database/schema/mysql-schema.sql

@@ -161,6 +161,17 @@ CREATE TABLE `blockables` (
   CONSTRAINT `blockables_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `communication_tools`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `communication_tools` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `name` json NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `connectables`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -843,7 +854,6 @@ CREATE TABLE `organizations` (
   `contact_person_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `contact_person_vrs` tinyint(1) DEFAULT NULL,
   `preferred_contact_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'email',
-  `preferred_contact_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `preferred_notification_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'email',
   `notification_settings` json DEFAULT NULL,
   `dismissed_invite_prompt_at` timestamp NULL DEFAULT NULL,
@@ -920,7 +930,6 @@ CREATE TABLE `projects` (
   `contact_person_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `contact_person_vrs` tinyint(1) DEFAULT NULL,
   `preferred_contact_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'email',
-  `preferred_contact_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `contact_person_response_time` json DEFAULT NULL,
   `estimate_requested_at` datetime DEFAULT NULL,
   `estimate_returned_at` datetime DEFAULT NULL,
@@ -1038,7 +1047,6 @@ CREATE TABLE `regulated_organizations` (
   `contact_person_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `contact_person_vrs` tinyint(1) DEFAULT NULL,
   `preferred_contact_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'email',
-  `preferred_contact_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `preferred_notification_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'email',
   `notification_settings` json DEFAULT NULL,
   `oriented_at` timestamp NULL DEFAULT NULL,
@@ -1415,13 +1423,6 @@ INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (157,'2023_07_12_14
 INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (158,'2023_07_19_145806_remove_completed_at_column_module_user_table',12);
 INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (159,'2023_10_16_174255_update_settings_table',13);
 INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (162,'2023_10_17_142724_remove_route_has_params_column_from_interpretations',14);
+INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (163,'2023_05_01_180138_create_general_settings',15);
+INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (164,'2023_05_01_201239_add_registration_links_to_general_settings',15);
 INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (165,'2023_10_25_150457_create_pages_table',15);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (171,'2024_02_01_180830_drop_communication_tools_table',16);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (182,'2024_02_06_143126_add_preferred_contact_language_to_projects_table',17);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (183,'2024_02_06_190129_add_preferred_contact_language_to_organizations_table',17);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (184,'2024_02_06_190140_add_preferred_contact_language_to_regulated_organizations_table',17);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (185,'2023_05_01_180138_create_general_settings',18);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (186,'2023_05_01_201239_add_registration_links_to_general_settings',18);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (187,'2023_11_17_145037_remove_registration_links_to_general_settings',18);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (188,'2023_11_17_150202_readd_registration_links_to_general_settings',18);
-INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (189,'2024_01_31_191956_add_privacy_email_to_general_settings',18);