Add custom color & abbr on CampCollaboration

ecamp · Jun 15, 2024 · d5bd715 · d5bd715
1 parent ea9e0a8
commit d5bd715
Show file tree

Hide file tree

Showing 17 changed files with 319 additions and 10 deletions.
diff --git a/api/migrations/schema/Version20240507154923.php b/api/migrations/schema/Version20240507154923.php
@@ -0,0 +1,27 @@
+<?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 Version20240507154923 extends AbstractMigration {
+    public function getDescription(): string {
+        return 'Add color and abbr to camp_collaboration';
+    }
+
+    public function up(Schema $schema): void {
+        $this->addSql('ALTER TABLE camp_collaboration ADD color VARCHAR(8) DEFAULT NULL');
+        $this->addSql('ALTER TABLE camp_collaboration ADD abbr VARCHAR(2) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void {
+        $this->addSql('ALTER TABLE camp_collaboration DROP color');
+        $this->addSql('ALTER TABLE camp_collaboration DROP abbr');
+    }
+}
diff --git a/api/src/Entity/CampCollaboration.php b/api/src/Entity/CampCollaboration.php
@@ -202,6 +202,25 @@ class CampCollaboration extends BaseEntity implements BelongsToCampInterface {
     #[ORM\Column(type: 'string', length: 16, nullable: false)]
     public string $role;
 
+    /**
+     * The color of the avatar as a hex color string.
+     */
+    #[InputFilter\Trim]
+    #[Assert\Regex(pattern: '/^#[0-9a-zA-Z]{6}$/')]
+    #[ApiProperty(example: '#4DBB52')]
+    #[Groups(['read', 'write'])]
+    #[ORM\Column(type: 'string', length: 8, nullable: true)]
+    public ?string $color = null;
+
+    /**
+     * The abbreviation in th avatar.
+     */
+    #[InputFilter\Trim]
+    #[ApiProperty(example: 'AB')]
+    #[Groups(['read', 'write'])]
+    #[ORM\Column(type: 'string', length: 2, nullable: true)]
+    public ?string $abbr = null;
+
     #[ApiProperty(readable: false, writable: false)]
     #[ORM\Column(type: 'text', nullable: true)]
     public ?string $collaborationAcceptedBy = null;

diff --git a/...SnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json b/...SnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json
@@ -61,6 +61,8 @@
                     },
                     "user": "escaped_value"
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -139,6 +141,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -217,6 +221,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -295,6 +301,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -373,6 +381,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -451,6 +461,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -529,6 +541,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -607,6 +621,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -685,6 +701,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -763,6 +781,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -841,6 +861,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -919,6 +941,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",

diff --git a/...sponseSnapshotTest__testGetItemMatchesStructure with data set camp_collaborations__1.json b/...sponseSnapshotTest__testGetItemMatchesStructure with data set camp_collaborations__1.json
@@ -71,6 +71,8 @@
             "href": "escaped_value"
         }
     },
+    "abbr": "escaped_value",
+    "color": "escaped_value",
     "id": "escaped_value",
     "inviteEmail": "escaped_value",
     "role": "escaped_value",

diff --git a/...snapshots__/ResponseSnapshotTest__testGetItemMatchesStructure with data set camps__1.json b/...snapshots__/ResponseSnapshotTest__testGetItemMatchesStructure with data set camps__1.json
@@ -14,6 +14,8 @@
                     },
                     "user": "escaped_value"
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -45,6 +47,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -76,6 +80,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -107,6 +113,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -138,6 +146,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",
@@ -169,6 +179,8 @@
                         "href": "escaped_value"
                     }
                 },
+                "abbr": "escaped_value",
+                "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
                 "role": "escaped_value",