fix: resolve location for opportunity only by country for now

Author: capJavert

src/entity/dataset/utils.ts

@@ -26,22 +26,22 @@ export const createLocationFromMapbox = async (
  */
 export const findDatasetLocation = async (
   con: DataSource,
-  locationData: {
-    iso2?: string | null;
-  },
+  locationData: Partial<Pick<DatasetLocation, 'iso2' | 'city' | 'subdivision'>>,
 ): Promise<DatasetLocation | null> => {
   const { iso2 } = locationData;
 
   if (!iso2) {
     return null;
   }
 
-  const repo = con.manager.getRepository(DatasetLocation);
+  const locationQuery = con.manager
+    .getRepository(DatasetLocation)
+    .createQueryBuilder()
+    .where('iso2 = :iso2Only', { iso2Only: iso2 })
+    .andWhere('city IS NULL')
+    .andWhere('subdivision IS NULL');
 
-  // Find location by iso2 country code
-  const location = await repo.findOne({
-    where: { iso2: iso2.toUpperCase() },
-  });
+  const location = await locationQuery.getOne();
 
   return location;
 };

src/schema/opportunity.ts

@@ -2756,10 +2756,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
         const opportunityContent = new OpportunityContent(renderedContent);
 
         // Extract and process locations
-        const locationData = (parsedOpportunity.location || []) as Array<{
-          iso2?: string;
-          type?: number;
-        }>;
+        const locationData = parsedOpportunity.location || [];
 
         const opportunityResult = await ctx.con.transaction(
           async (entityManager) => {
@@ -2788,9 +2785,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
 
             // Create OpportunityLocation entries for each location
             for (const loc of locationData) {
-              const datasetLocation = await findDatasetLocation(ctx.con, {
-                iso2: loc.iso2,
-              });
+              const datasetLocation = await findDatasetLocation(ctx.con, loc);
 
               if (datasetLocation) {
                 await entityManager.getRepository(OpportunityLocation).save({