From d289b429a18bd68db08607f599d7c21efd564621 Mon Sep 17 00:00:00 2001
From: Christian Kuhtz <christian@kuhtz.com>
Date: Thu, 25 Jul 2024 02:15:05 +0000
Subject: [PATCH] refactor

---
 api/routers/configuration/get.py        | 28 ++++++++++++++++--
 api/routers/configuration/operations.py | 39 +++++++++++--------------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/api/routers/configuration/get.py b/api/routers/configuration/get.py
index b3a9c58..d6e8851 100644
--- a/api/routers/configuration/get.py
+++ b/api/routers/configuration/get.py
@@ -1,4 +1,28 @@
 # Configuration GET
 
-def get():
-    return
+# from enum import Enum
+from ast import Dict
+from fastapi import Request, Response
+
+# Data models
+
+# class SectionName(str, Enum):
+#     n0nbh = 'n0nbh'
+#     couchbase = 'couchbase'
+
+def get(
+        response: Response,
+        request: Request,
+        instance_param: str = None,
+        section_param: str = None
+) -> Dict:
+
+    return_dict = {'section': section_param, 'instance': instance_param}
+
+    # match section_param:
+    #     case SectionName.couchbase:
+    #         return_dict.update({'message': 'i am a futon.'})
+    #     case SectionName.n0nbh:
+    #         return_dict.update({'message': 'it is dark.'})
+
+    return return_dict
diff --git a/api/routers/configuration/operations.py b/api/routers/configuration/operations.py
index 86ab8b7..c8f2235 100644
--- a/api/routers/configuration/operations.py
+++ b/api/routers/configuration/operations.py
@@ -1,7 +1,8 @@
 # Configuration operations
 
 from enum import Enum
-from fastapi import APIRouter, Body, Request, Response
+from typing import Optional
+from fastapi import APIRouter, Body, Path, Request, Response, Query
 
 from .get import get as configuration_get
 from .put import put as configuration_put
@@ -20,34 +21,28 @@ class SectionName(str, Enum):
     n0nbh = 'n0nbh'
     couchbase = 'couchbase'
 
-
-
 # GET
 
 @router.get('/configuration')
-async def get_config_all(
+@router.get('/configuration/{instance}')
+@router.get('/configuration/{instance}/{section}')
+def get_config(
     request: Request,
-    response: Response
+    response: Response,
+    instance: str = None,
+    section: SectionName = None
 ):
-    # get(
-    #     request=request,
-    #     response=response,
-    # )
-    return {'message': 'that\'s everything.'}
+    return_dict = configuration_get(
+        request=request,
+        response=response,
+        instance_param=instance,
+        section_param=section
+    )
+    
+    print(f'return_dict: {return_dict}')
 
+    return return_dict
 
-@router.get('/configuration/{instance}')
-async def get_config_instance(instance: str):
-    return {'instance': instance}
-
-
-@router.get('/configuration/{instance}/{section}')
-async def get_config_instance_section(instance: str, section: SectionName):
-    match section:
-        case SectionName.couchbase:
-            return {'message': 'i am a futon.'}
-        case SectionName.n0nbh:
-            return {'message': 'it is dark.'}