Pārlūkot izejas kodu

chore: Update useCountry filtering logic to handle uppercase country codes

x1ongzhu 1 gadu atpakaļ
vecāks
revīzija
9fa0d2518e
1 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 6 3
      src/task/task.service.ts

+ 6 - 3
src/task/task.service.ts

@@ -763,7 +763,7 @@ export class TaskService implements OnModuleInit {
                     const res = tasks.map((task) => {
                         return {
                             task,
-                            useCountry: task.country ? ['any'] : countryMapping[task.country] || ['any'],
+                            useCountry: task.country ? countryMapping[task.country] || ['any'] : ['any'],
                             devices: []
                         }
                     })
@@ -772,11 +772,14 @@ export class TaskService implements OnModuleInit {
                         let candidateTasks
                         if (device.matchCountry) {
                             candidateTasks = res.filter((r) => {
-                                return r.useCountry.includes(device.pinCountry)
+                                return r.useCountry.includes(device.pinCountry.toUpperCase())
                             })
                         } else {
                             candidateTasks = res.filter((r) => {
-                                return r.useCountry.includes('any') || r.useCountry.includes(device.currentCountry)
+                                return (
+                                    r.useCountry.includes('any') ||
+                                    r.useCountry.includes(device.currentCountry.toUpperCase())
+                                )
                             })
                         }
                         if (candidateTasks.length > 0) {