Merged in fix/SW-2921-countryName (pull request #2249)

fix(SW-2921): Moved countryName to attributes in locations schema

* fix(SW-2921): Moved countryName to attributes in locations schema


Approved-by: Linus Flood

apps/scandic-web/server/routers/hotels/output.ts

@@ -440,7 +440,7 @@ export const locationsSchema = z.object({
           if (location.type === "cities") {
             return {
               ...location.attributes,
-              country: location?.countryName || "",
+              country: location.attributes.countryName || "",
               id: location.id,
               type: location.type,
             }

apps/scandic-web/server/routers/hotels/schemas/location/city.ts

@@ -5,9 +5,9 @@ export const locationCitySchema = z.object({
     cityIdentifier: z.string().optional(),
     keyWords: z.array(z.string()).optional(),
     name: z.string().optional().default(""),
+    countryName: z.string().optional().default(""),
     isPublished: z.boolean(),
   }),
-  countryName: z.string().optional().default(""),
   id: z.string().optional().default(""),
   type: z.literal("cities"),
 })