From ce743a9f99612facbcbc2495e126136984ab856f Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Thu, 5 Sep 2024 17:41:31 +0200
Subject: [PATCH] add countries to screener

---
 src/lib/utils.ts                              | 39 +++++++++++++++++++
 .../stock-screener/[strategyId]/+page.svelte  | 13 +++++--
 .../[strategyId]/workers/filterWorker.ts      | 17 +++++++-
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 91bcc4ca..8c3094a3 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -993,6 +993,45 @@ export const listOfCountries = [
   "Zimbabwe",
 ];
 
+export const listOfRelevantCountries = [
+  "United States", // By far the most companies listed on the NYSE
+  "China",
+  "Canada",
+  "UK",
+  "Japan",
+  "Israel",
+  "Brazil",
+  "France",
+  "Ireland",
+  "Germany",
+  "Mexico",
+  "India",
+  "Australia",
+  "South Korea",
+  "Sweden",
+  "Netherlands",
+  "Switzerland",
+  "Taiwan",
+  "South Africa",
+  "Hong Kong",
+  "Singapore",
+  "Argentina",
+  "Chile",
+  "Philippines",
+  "Turkey",
+  "Italy",
+  "Indonesia",
+  "Malaysia",
+  "Luxembourg",
+  "Vietnam",
+  "New Zealand",
+  "Denmark",
+  "Norway",
+  "Finland",
+  "Russia",
+  "United Arab Emirates",
+];
+
 export const sectorList = [
   "Basic Materials",
   "Communication Services",
diff --git a/src/routes/stock-screener/[strategyId]/+page.svelte b/src/routes/stock-screener/[strategyId]/+page.svelte
index a384e31b..d68a9f86 100644
--- a/src/routes/stock-screener/[strategyId]/+page.svelte
+++ b/src/routes/stock-screener/[strategyId]/+page.svelte
@@ -1,12 +1,13 @@
 <script lang='ts'>
   import { onMount, onDestroy } from 'svelte';
   import { goto} from '$app/navigation';
-  import { screenWidth, strategyId, numberOfUnreadNotification, getCache, setCache} from '$lib/store';
+  import { screenWidth, strategyId, numberOfUnreadNotification} from '$lib/store';
   import toast from 'svelte-french-toast';
-  import { abbreviateNumber, sectorList } from '$lib/utils';
+  import { abbreviateNumber, sectorList, listOfRelevantCountries } from '$lib/utils';
   import * as DropdownMenu from "$lib/components/shadcn/dropdown-menu/index.js";
   import { Button } from "$lib/components/shadcn/button/index.js";
   //const userConfirmation = confirm('Unsaved changes detected. Leaving now will discard your strategy. Continue?');
+
   import { writable } from 'svelte/store';
 
   let shouldLoadWorker = writable(false);
@@ -129,6 +130,7 @@ const allRules = {
   profitPerEmployee: { label: 'Profit Per Employee', step: ['5M','3M','2M','1M','500K','100K',0], category: 'fund', defaultCondition: 'over', defaultValue: '0' },
   totalLiabilities: { label: 'Total Liabilities', step: ['500B','200B','100B','50B','10B','1B','100M','10M','1M'], category: 'fund', defaultCondition: 'over', defaultValue: '1M' },
   sector: { label: 'Sector', step: sectorList, category: 'fund', defaultCondition: '', defaultValue: 'any' },
+  country: { label: 'Country', step: listOfRelevantCountries, category: 'fund', defaultCondition: '', defaultValue: 'any' },
 
 };
 
@@ -242,6 +244,9 @@ function handleAddRule() {
       case 'sector':
         newRule = { name: ruleName, value:  valueMappings[ruleName] }; //ruleTrend[ruleName]
         break;
+      case 'country':
+        newRule = { name: ruleName, value:  valueMappings[ruleName] }; //ruleTrend[ruleName]
+        break;
       default:
         // Handle other cases if needed
         newRule ={ 
@@ -781,7 +786,7 @@ async function popularStrategy(state: string) {
                                   </Button>
                                 </DropdownMenu.Trigger>
                                 <DropdownMenu.Content class="w-56 h-fit max-h-72 overflow-y-auto scroller">
-                                  {#if !['analystRating','sector']?.includes(row?.rule)}
+                                  {#if !['analystRating','sector','country']?.includes(row?.rule)}
                                   <DropdownMenu.Label class="absolute mt-2 h-11 border-gray-800 border-b -top-1 z-20 fixed sticky bg-[#09090B]">
                                     <div class="flex items-center justify-start gap-x-1">
                                         <div class="relative inline-block flex flex-row items-center justify-center">
@@ -1043,6 +1048,8 @@ async function popularStrategy(state: string) {
                               {item?.analystRating}
                               {:else if row?.rule === 'sector'}
                               {item?.sector}
+                              {:else if row?.rule === 'country'}
+                              {item?.country}
                               {:else if ['fundamentalAnalysis','trendAnalysis']?.includes(row?.rule)}
                               {item[row?.rule]?.accuracy}%
                               {:else}
diff --git a/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts b/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
index 8c5a64fe..f3a3e6b6 100644
--- a/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
+++ b/src/routes/stock-screener/[strategyId]/workers/filterWorker.ts
@@ -1,4 +1,4 @@
-import { sectorList } from "$lib/utils";
+import { sectorList, listOfRelevantCountries } from "$lib/utils";
 
 function convertUnitToValue(input: string | number): number {
   if (typeof input === "number") {
@@ -14,7 +14,13 @@ function convertUnitToValue(input: string | number): number {
   // Handle specific non-numeric cases
   if (
     input.toLowerCase() === "any" ||
-    [...sectorList, "Hold", "Sell", "Buy"]?.includes(input)
+    [
+      ...sectorList,
+      ...listOfRelevantCountries,
+      "Hold",
+      "Sell",
+      "Buy",
+    ]?.includes(input)
   ) {
     return "any"; // Return a special value for "any" that represents a non-restrictive filter
   }
@@ -80,6 +86,13 @@ async function filterStockScreenerData(stockScreenerData, ruleOfList) {
         if (sectorList?.includes(rule.value) && itemValue !== rule.value) {
           return false;
         }
+      } else if (rule.name === "country") {
+        if (
+          listOfRelevantCountries?.includes(rule.value) &&
+          itemValue !== rule.value
+        ) {
+          return false;
+        }
       } else {
         if (
           rule.condition === "over" &&