Überarbeitung

bizmatch-server/src/utils.ts

@@ -33,11 +33,14 @@ type DrizzleUser = typeof users.$inferSelect;
 type DrizzleBusinessListing = typeof businesses.$inferSelect;
 type DrizzleCommercialPropertyListing = typeof commercials.$inferSelect;
 export function convertBusinessToDrizzleBusiness(businessListing: Partial<BusinessListing>): DrizzleBusinessListing {
-  return flattenObject(businessListing);
+  const drizzleBusinessListing = flattenObject(businessListing);
+  drizzleBusinessListing.city = drizzleBusinessListing.name;
+  delete drizzleBusinessListing.name;
+  return drizzleBusinessListing;
 }
 export function convertDrizzleBusinessToBusiness(drizzleBusinessListing: Partial<DrizzleBusinessListing>): BusinessListing {
   const o = {
-    location_city: drizzleBusinessListing.city,
+    location_name: drizzleBusinessListing.city,
     location_state: drizzleBusinessListing.state,
     location_latitude: drizzleBusinessListing.latitude,
     location_longitude: drizzleBusinessListing.longitude,
@@ -50,11 +53,14 @@ export function convertDrizzleBusinessToBusiness(drizzleBusinessListing: Partial
   return unflattenObject(o);
 }
 export function convertCommercialToDrizzleCommercial(commercialPropertyListing: Partial<CommercialPropertyListing>): DrizzleCommercialPropertyListing {
-  return flattenObject(commercialPropertyListing);
+  const drizzleCommercialPropertyListing = flattenObject(commercialPropertyListing);
+  drizzleCommercialPropertyListing.city = drizzleCommercialPropertyListing.name;
+  delete drizzleCommercialPropertyListing.name;
+  return drizzleCommercialPropertyListing;
 }
 export function convertDrizzleCommercialToCommercial(drizzleCommercialPropertyListing: Partial<DrizzleCommercialPropertyListing>): CommercialPropertyListing {
   const o = {
-    location_city: drizzleCommercialPropertyListing.city,
+    location_name: drizzleCommercialPropertyListing.city,
     location_state: drizzleCommercialPropertyListing.state,
     location_latitude: drizzleCommercialPropertyListing.latitude,
     location_longitude: drizzleCommercialPropertyListing.longitude,
@@ -67,12 +73,15 @@ export function convertDrizzleCommercialToCommercial(drizzleCommercialPropertyLi
   return unflattenObject(o);
 }
 export function convertUserToDrizzleUser(user: Partial<User>): DrizzleUser {
-  return flattenObject(user);
+  const drizzleUser = flattenObject(user);
+  drizzleUser.city = drizzleUser.name;
+  delete drizzleUser.name;
+  return drizzleUser;
 }
 
 export function convertDrizzleUserToUser(drizzleUser: Partial<DrizzleUser>): User {
   const o = {
-    companyLocation_city: drizzleUser.city,
+    companyLocation_name: drizzleUser.city,
     companyLocation_state: drizzleUser.state,
     companyLocation_latitude: drizzleUser.latitude,
     companyLocation_longitude: drizzleUser.longitude,