From e5cddf5ef73425ebf1f408d58930f76d759c1c7b Mon Sep 17 00:00:00 2001
From: Johannes Nussbaum <39048939+jnussbaum@users.noreply.github.com>
Date: Fri, 10 Mar 2023 10:14:13 +0100
Subject: [PATCH] chore: merge dublette class into one class (DEV-1831) #322

---
 src/dsp_tools/models/ontology.py    | 15 ++-------------
 src/dsp_tools/models/set_encoder.py |  6 ++++++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/dsp_tools/models/ontology.py b/src/dsp_tools/models/ontology.py
index 9cbca8d9d..3a04cce51 100644
--- a/src/dsp_tools/models/ontology.py
+++ b/src/dsp_tools/models/ontology.py
@@ -7,23 +7,12 @@
 from pystrict import strict
 
 from dsp_tools.models.connection import Connection
-from dsp_tools.models.helpers import Actions, BaseError, Context, DateTimeStamp, OntoIri, WithId
+from dsp_tools.models.helpers import Actions, BaseError, Context, DateTimeStamp, WithId
 from dsp_tools.models.model import Model
 from dsp_tools.models.project import Project
 from dsp_tools.models.propertyclass import PropertyClass
 from dsp_tools.models.resourceclass import ResourceClass
-
-
-class SetEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, set):
-            return list(obj)
-        elif isinstance(obj, Context):
-            return obj.toJsonObj()
-        elif isinstance(obj, OntoIri):
-            return {"iri": obj.iri, "hashtag": obj.hashtag}
-        return json.JSONEncoder.default(self, obj)
-
+from dsp_tools.models.set_encoder import SetEncoder
 
 """
 This model implements the handling of ontologies. It is to note that ResourceClasses, PropertyClasses
diff --git a/src/dsp_tools/models/set_encoder.py b/src/dsp_tools/models/set_encoder.py
index 0a36cf5da..56c145afd 100644
--- a/src/dsp_tools/models/set_encoder.py
+++ b/src/dsp_tools/models/set_encoder.py
@@ -1,8 +1,14 @@
 import json
 
+from dsp_tools.models.helpers import Context, OntoIri
+
 
 class SetEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, set):
             return list(obj)
+        elif isinstance(obj, Context):
+            return obj.toJsonObj()
+        elif isinstance(obj, OntoIri):
+            return {"iri": obj.iri, "hashtag": obj.hashtag}
         return json.JSONEncoder.default(self, obj)