From 96b4cdc0eaa6d5457174bb5364de1539ef13deb1 Mon Sep 17 00:00:00 2001
From: Computerboer <git@ikbenhenk.nl>
Date: Sun, 9 Jul 2023 20:38:13 +0200
Subject: [PATCH] Added onlineveilingmeester auctions

---
 Auctionviewer.api.pyproj | 13 ++++++++++++-
 models/location.py       |  1 +
 utils/auctionutils.py    | 29 ++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/Auctionviewer.api.pyproj b/Auctionviewer.api.pyproj
index e03b9ea..3406207 100644
--- a/Auctionviewer.api.pyproj
+++ b/Auctionviewer.api.pyproj
@@ -13,7 +13,7 @@
     <Name>Auctionviewer.api</Name>
     <RootNamespace>PythonAuctionviewer</RootNamespace>
     <IsWindowsApplication>False</IsWindowsApplication>
-    <InterpreterId>Global|PythonCore|3.6-32</InterpreterId>
+    <InterpreterId>MSBuild|virtEnv_1|$(MSBuildProjectFullPath)</InterpreterId>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
     <EnableNativeCodeDebugging>True</EnableNativeCodeDebugging>
     <SuppressPackageInstallationPrompt>True</SuppressPackageInstallationPrompt>
@@ -47,6 +47,17 @@
     <Folder Include="data\" />
     <Folder Include="utils\" />
   </ItemGroup>
+  <ItemGroup>
+    <Interpreter Include="virtEnv_1\">
+      <Id>virtEnv_1</Id>
+      <Version>3.11</Version>
+      <Description>virtEnv_1 (Python 3.11 (64-bit))</Description>
+      <InterpreterPath>Scripts\python.exe</InterpreterPath>
+      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
+      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
+      <Architecture>X64</Architecture>
+    </Interpreter>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in
diff --git a/models/location.py b/models/location.py
index 50ddeda..c571a89 100644
--- a/models/location.py
+++ b/models/location.py
@@ -9,6 +9,7 @@ class Countrycode(Enum):
 class Auctionbrand(str, Enum):
     NONE = "NONE",
     TWK = "TWK"
+    OVM = "OVM"
 
 
 class GeonameLocation:
diff --git a/utils/auctionutils.py b/utils/auctionutils.py
index fa0819f..517264d 100644
--- a/utils/auctionutils.py
+++ b/utils/auctionutils.py
@@ -1,3 +1,4 @@
+from asyncio.windows_events import NULL
 import requests
 from cache import Cache
 from models.location import Auction, Auctionbrand, Countrycode, Maplocation
@@ -10,7 +11,10 @@ def getAuctionlocations(countrycode: Countrycode):
     res = Cache.get(cachename)
     if(res): return res
     
-    auctions = getTwkAuctions(countrycode)
+
+    twkauctions = getTwkAuctions(countrycode)
+    ovmauctions = getOVMAuctions() 
+    auctions = [*twkauctions, *ovmauctions]
 
     for auction in auctions:
         auction.geonamelocation = getGeoLocationByCity(auction.city, countrycode)
@@ -47,11 +51,11 @@ def get_geonameid(auction):
 
 def getTwkAuctions(countrycode):
     cachename = 'TwkAuctions_'+ countrycode
-    response = requests.get("https://api.troostwijkauctions.com/sale/4/listgrouped?batchSize=99999&CountryIDs=" + countrycode)
-
     res = Cache.get(cachename)
     if(res):return res
 
+    response = requests.get("https://api.troostwijkauctions.com/sale/4/listgrouped?batchSize=99999&CountryIDs=" + countrycode)
+
     if(response.status_code ==200):
         print('Got Twk Auctions')
         data = response.json();
@@ -62,5 +66,24 @@ def getTwkAuctions(countrycode):
                 auctions.append(a)
         Cache.add(cachename, auctions)
 
+        return auctions
+    return None
+
+def getOVMAuctions():
+    cachename = 'OnlineVeiling_'
+    res = Cache.get(cachename)
+    if(res):return res
+
+    response = requests.get("https://onlineveilingmeester.nl/rest/nl/veilingen?status=open&domein=ONLINEVEILINGMEESTER")
+
+    if(response.status_code ==200):
+        data = response.json()
+        auctions = []
+        for result in data['veilingen']:
+              cityname ="Nederland"  if result['isBezorgVeiling'] else result['afgifteAdres']['plaats'] 
+              cityname = "Nederland" if cityname is None else cityname #there can be auctions where you have to make an appointment to retrieve the lots
+              a = Auction(Auctionbrand.OVM, cityname,result['land'], result['naam'],result['openingsDatumISO'], result['sluitingsDatumISO'], str(result['land']).lower() + '/veilingen/' + str(result['id']) + '/kavels', 'images/150x150/' + str(result['id']) + '/' + result['image'], result['totaalKavels'] )
+              auctions.append(a)
+        Cache.add(cachename, auctions)
         return auctions
     return None
\ No newline at end of file