Rename abbr to abbreviation

ecamp · Jun 19, 2024 · 792a8db · 792a8db
1 parent 555f40b
commit 792a8db
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 75 deletions.
diff --git a/api/migrations/schema/Version20240507154923.php b/api/migrations/schema/Version20240507154923.php
@@ -12,16 +12,16 @@
  */
 final class Version20240507154923 extends AbstractMigration {
     public function getDescription(): string {
-        return 'Add color and abbr to camp_collaboration';
+        return 'Add color and abbreviation 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');
+        $this->addSql('ALTER TABLE camp_collaboration ADD abbreviation TEXT DEFAULT NULL');
     }
 
     public function down(Schema $schema): void {
+        $this->addSql('ALTER TABLE camp_collaboration DROP abbreviation');
         $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
@@ -213,13 +213,13 @@ class CampCollaboration extends BaseEntity implements BelongsToCampInterface {
     public ?string $color = null;
 
     /**
-     * The abbreviation in th avatar.
+     * The abbreviation in the avatar.
      */
     #[InputFilter\Trim]
     #[ApiProperty(example: 'AB')]
     #[Groups(['read', 'write'])]
-    #[ORM\Column(type: 'string', length: 2, nullable: true)]
-    public ?string $abbr = null;
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $abbreviation = null;
 
     #[ApiProperty(readable: false, writable: false)]
     #[ORM\Column(type: 'text', nullable: true)]

diff --git a/...SnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json b/...SnapshotTest__testGetCollectionMatchesStructure with data set camp_collaborations__1.json
@@ -61,7 +61,7 @@
                     },
                     "user": "escaped_value"
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -141,7 +141,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -221,7 +221,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -301,7 +301,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -381,7 +381,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -461,7 +461,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -541,7 +541,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -621,7 +621,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -701,7 +701,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -781,7 +781,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -861,7 +861,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -941,7 +941,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "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,7 +71,7 @@
             "href": "escaped_value"
         }
     },
-    "abbr": "escaped_value",
+    "abbreviation": "escaped_value",
     "color": "escaped_value",
     "id": "escaped_value",
     "inviteEmail": "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,7 +14,7 @@
                     },
                     "user": "escaped_value"
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -47,7 +47,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -80,7 +80,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -113,7 +113,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -146,7 +146,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",
@@ -179,7 +179,7 @@
                         "href": "escaped_value"
                     }
                 },
-                "abbr": "escaped_value",
+                "abbreviation": "escaped_value",
                 "color": "escaped_value",
                 "id": "escaped_value",
                 "inviteEmail": "escaped_value",

diff --git a/...i/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml b/...i/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml
@@ -5322,8 +5322,8 @@ components:
       deprecated: false
       description: 'A user participating in some way in the planning or realization of a camp.'
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
           type:
             - 'null'
@@ -5375,10 +5375,9 @@ components:
       deprecated: false
       description: ''
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5451,10 +5450,9 @@ components:
       deprecated: false
       description: 'A user participating in some way in the planning or realization of a camp.'
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5533,10 +5531,9 @@ components:
       deprecated: false
       description: 'A user participating in some way in the planning or realization of a camp.'
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5592,10 +5589,9 @@ components:
       deprecated: false
       description: 'A user participating in some way in the planning or realization of a camp.'
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5646,10 +5642,9 @@ components:
                   maxLength: 16
                   readOnly: true
                   type: string
-                abbr:
-                  description: 'The abbreviation in th avatar.'
+                abbreviation:
+                  description: 'The abbreviation in the avatar.'
                   example: AB
-                  maxLength: 2
                   type: ['null', string]
                 color:
                   description: 'The color of the avatar as a hex color string.'
@@ -5731,8 +5726,8 @@ components:
                   type: string
               type: object
           type: object
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
           type:
             - 'null'
@@ -5793,10 +5788,9 @@ components:
                   type: string
               type: object
           type: object
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5878,10 +5872,9 @@ components:
                   type: string
               type: object
           type: object
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -5965,10 +5958,9 @@ components:
                   type: string
               type: object
           type: object
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -6047,8 +6039,8 @@ components:
         '@type':
           readOnly: true
           type: string
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
           type:
             - 'null'
@@ -6123,10 +6115,9 @@ components:
         '@type':
           readOnly: true
           type: string
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -6222,10 +6213,9 @@ components:
         '@type':
           readOnly: true
           type: string
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string
@@ -6300,10 +6290,9 @@ components:
       deprecated: false
       description: 'A user participating in some way in the planning or realization of a camp.'
       properties:
-        abbr:
-          description: 'The abbreviation in th avatar.'
+        abbreviation:
+          description: 'The abbreviation in the avatar.'
           example: AB
-          maxLength: 2
           type:
             - 'null'
             - string

diff --git a/common/helpers/campCollaborationInitials.js b/common/helpers/campCollaborationInitials.js
@@ -5,7 +5,7 @@ import initials from './initials.js'
  * Returns two characters to display for a camp collaboration based on its user
  */
 export default function (campCollaboration) {
-  return campCollaboration?.abbr
-    ? campCollaboration.abbr
+  return campCollaboration?.abbreviation
+    ? campCollaboration.abbreviation
     : initials(campCollaborationDisplayName(campCollaboration, null, false))
 }