use an address formatting library

CabinDAO · Mar 19, 2024 · fa83d73 · fa83d73
1 parent 4f2e162
commit fa83d73
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 12 deletions.
diff --git a/lib/address.ts b/lib/address.ts
@@ -1,25 +1,42 @@
+import addressFormatter from '@fragaria/address-formatter'
 import { EMPTY } from '@/utils/display-utils'
 
 export interface FormatShortAddressParams {
   locality?: string | null | undefined
   admininstrativeAreaLevel1Short?: string | null | undefined
   country?: string | null | undefined
+  countryShort?: string | null | undefined
 }
 
 export const formatShortAddress = (
   address: FormatShortAddressParams | null | undefined
 ): string => {
   if (!address) return EMPTY
 
-  if (!address.locality && !address.admininstrativeAreaLevel1Short) {
-    return EMPTY
-  } else if (!address.locality) {
-    return `${address.admininstrativeAreaLevel1Short ?? EMPTY} | ${
-      address.country ?? EMPTY
-    }`
-  } else {
-    return `${address.locality ?? EMPTY}, ${
-      address.admininstrativeAreaLevel1Short ?? EMPTY
-    } | ${address.country ?? EMPTY}`
-  }
+  const formatted = addressFormatter.format(
+    {
+      city: address.locality || undefined,
+      state: address.admininstrativeAreaLevel1Short || undefined,
+    },
+    {
+      abbreviate: true,
+      appendCountry: false,
+      countryCode: address.countryShort || undefined,
+      fallbackCountryCode: 'US',
+    }
+  )
+
+  return formatted + (address.country ? ` | ${address.country}` : '')
+
+  // if (!address.locality && !address.admininstrativeAreaLevel1Short) {
+  //   return EMPTY
+  // } else if (!address.locality) {
+  //   return `${address.admininstrativeAreaLevel1Short ?? EMPTY} | ${
+  //     address.country ?? EMPTY
+  //   }`
+  // } else {
+  //   return `${address.locality ?? EMPTY}, ${
+  //     address.admininstrativeAreaLevel1Short ?? EMPTY
+  //   } | ${address.country ?? EMPTY}`
+  // }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.5",
+    "@fragaria/address-formatter": "^5.3.0",
     "@next/font": "^14.1.3",
     "@pinata/sdk": "^2.1.0",
     "@prisma/client": "^5.7.0",

diff --git a/pages/api/v2/activity/list.ts b/pages/api/v2/activity/list.ts
@@ -131,6 +131,7 @@ const toFragments = (
                   activity.location.address?.admininstrativeAreaLevel1Short ||
                   '',
                 country: activity.location.address?.country || '',
+                countryShort: activity.location.address?.countryShort || '',
               },
               voteCount: 0, // TODO: implement
               offerCount: 0, // TODO: implement
@@ -160,6 +161,8 @@ const toFragments = (
                         activity.offer.location.address
                           .admininstrativeAreaLevel1Short || '',
                       country: activity.offer.location.address.country || '',
+                      countryShort:
+                        activity.offer.location.address.countryShort || '',
                     }
                   : null,
                 caretaker: {

diff --git a/pages/api/v2/offer/list.ts b/pages/api/v2/offer/list.ts
@@ -107,6 +107,7 @@ export const offerToFragment = (offer: OfferWithRelations): OfferFragment => {
             admininstrativeAreaLevel1Short:
               offer.location.address.admininstrativeAreaLevel1Short,
             country: offer.location.address.country,
+            countryShort: offer.location.address.countryShort,
           }
         : null,
       caretaker: {

diff --git a/pages/api/v2/profile/[externId].ts b/pages/api/v2/profile/[externId].ts
@@ -283,6 +283,7 @@ const profileToFragment = (profile: ProfileWithRelations): ProfileFragment => {
           admininstrativeAreaLevel1Short:
             profile.address.admininstrativeAreaLevel1Short,
           country: profile.address.country,
+          countryShort: profile.address.countryShort,
         }
       : undefined,
     citizenshipStatus: profile.citizenshipStatus as CitizenshipStatus,

diff --git a/pages/api/v2/profile/list.ts b/pages/api/v2/profile/list.ts
@@ -220,6 +220,7 @@ const profilesToFragments = (
             admininstrativeAreaLevel1Short:
               profile.address.admininstrativeAreaLevel1Short,
             country: profile.address.country,
+            countryShort: profile.address.countryShort,
           }
         : null,
       avatar: profile.avatar

diff --git a/utils/types/activity.ts b/utils/types/activity.ts
@@ -171,6 +171,7 @@ export type ActivityWithRelations = Prisma.ActivityGetPayload<{
             locality: true
             admininstrativeAreaLevel1Short: true
             country: true
+            countryShort: true
           }
         }
       }
@@ -198,6 +199,7 @@ export type ActivityWithRelations = Prisma.ActivityGetPayload<{
                 locality: true
                 admininstrativeAreaLevel1Short: true
                 country: true
+                countryShort: true
               }
             }
             caretaker: {
@@ -270,6 +272,7 @@ export const ActivityQueryInclude = {
           locality: true,
           admininstrativeAreaLevel1Short: true,
           country: true,
+          countryShort: true,
         },
       },
     },
@@ -297,6 +300,7 @@ export const ActivityQueryInclude = {
               locality: true,
               admininstrativeAreaLevel1Short: true,
               country: true,
+              countryShort: true,
             },
           },
           caretaker: {

diff --git a/utils/types/location.ts b/utils/types/location.ts
@@ -40,7 +40,7 @@ export type AddressFragment = {
 
 export type ShortAddressFragment = Pick<
   AddressFragment,
-  'locality' | 'admininstrativeAreaLevel1Short' | 'country'
+  'locality' | 'admininstrativeAreaLevel1Short' | 'country' | 'countryShort'
 >
 
 export type RecentVoterFragment = {