Überarbeitung

bizmatch-server/src/models/main.model.ts

@@ -1,4 +1,5 @@
 import { BusinessListing, CommercialPropertyListing, Sender, User } from './db.model.js';
+import { State } from './server.model.js';
 
 export interface StatesResult {
   state: string;
@@ -59,7 +60,7 @@ export interface ListCriteria {
   page: number;
   types: string[];
   state: string;
-  city: string;
+  city: GeoResult;
   prompt: string;
   searchType: 'exact' | 'radius';
   // radius: '5' | '20' | '50' | '100' | '200' | '300' | '400' | '500';
@@ -224,18 +225,23 @@ export interface UploadParams {
 }
 export interface GeoResult {
   id: number;
-  city: string;
+  name: string;
   state: string;
-  // state_code: string;
   latitude: number;
   longitude: number;
 }
-export interface CityAndStateResult {
+interface CityResult {
   id: number;
-  name: string;
-  type: string;
-  state: string;
+  type: 'city';
+  content: GeoResult;
 }
+
+interface StateResult {
+  id: number;
+  type: 'state';
+  content: State;
+}
+export type CityAndStateResult = CityResult | StateResult;
 export interface CountyResult {
   id: number;
   name: string;