From e5fd9a7017836bda448f9fbe4d5e343ee28a0b07 Mon Sep 17 00:00:00 2001
From: gordonkoehn <gordon@koehn.net>
Date: Sun, 29 Oct 2023 11:29:29 +0100
Subject: [PATCH] make link

---
 backend/main.py                          |  6 +++---
 backend/src/lunchheros/db/dbFetcher.py   |  4 +++-
 backend/src/lunchheros/match/__init__.py |  2 +-
 backend/tests/match/test_randomize.py    | 13 +++++++++++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/backend/main.py b/backend/main.py
index 8ade5f6..ee77c17 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -1,8 +1,8 @@
  
-import lunchheros
+
 
 from fastapi.encoders import jsonable_encoder
-from src.lunchheros.db.dbFetcher import get_encoded_data
+from src.lunchheros.db.dbFetcher import filter_data, get_encoded_data
 from src.routes.users.userFunctions import getAllQueryListData, getAllUsers, getUserWithId
 from fastapi import FastAPI
 from supabase_client import supabase_client
@@ -30,6 +30,6 @@ def load_current_user(userId: str):
     userData = getUserWithId(userId)
     queryList = getAllQueryListData() 
 
-    test = lunchheros.match.match(userData)
+    test = filter_data(queryList)
 
     return { "currentUser" : userData, "query": queryList}
\ No newline at end of file
diff --git a/backend/src/lunchheros/db/dbFetcher.py b/backend/src/lunchheros/db/dbFetcher.py
index 6f9bd76..559c128 100644
--- a/backend/src/lunchheros/db/dbFetcher.py
+++ b/backend/src/lunchheros/db/dbFetcher.py
@@ -1,10 +1,12 @@
+from lunchheros import match
 import numpy as np
 import pandas as pd
 import json
 import os 
 
-async def get_encoded_data(time_slot: int, location: str, data):
+async def filter_data(data):
     print("get_encoded_data")
+    return match(data)
     # Transform data
     #print(f"Data {time_slot} {location} {data}")
     #df = pd.DataFrame(data)
diff --git a/backend/src/lunchheros/match/__init__.py b/backend/src/lunchheros/match/__init__.py
index 7233da5..d7f7564 100644
--- a/backend/src/lunchheros/match/__init__.py
+++ b/backend/src/lunchheros/match/__init__.py
@@ -1,5 +1,5 @@
 """Subpackage related to matching between users into groups."""
 
-from lunchheros.match import matching
+from lunchheros.match._randomize import matching
 
 __all__ = ["matching"]
\ No newline at end of file
diff --git a/backend/tests/match/test_randomize.py b/backend/tests/match/test_randomize.py
index e3236e7..4fa52e2 100644
--- a/backend/tests/match/test_randomize.py
+++ b/backend/tests/match/test_randomize.py
@@ -1,4 +1,4 @@
-from lunchheros.match._randomize import _randomize_groups
+from lunchheros.match._randomize import _randomize_groups, matching
 
 import json
 import numpy as np
@@ -37,4 +37,13 @@ def test_randomize_with_real():
     group_size = 4
     # randomize groups
     groups = _randomize_groups(group_size, numpy_array.tolist())
-    print(groups)
\ No newline at end of file
+    print(groups)
+
+
+def test_matching():
+
+    grouping = matching(test_data)
+
+    print(grouping)
+    return grouping
+    
\ No newline at end of file