Merge pull request #133 from ChanTsune/feature/refactor

Update functions.py

django_boost/utils/functions.py

@@ -7,24 +7,16 @@ def model_to_json(model, fields=(), exclude=()):
 
     Return value is a dictionary or a list for dictionary.
     """
+    opts = model._meta
     if isinstance(model, models.Model):
         json_data = {}
-
-        if fields:
-            for f in fields:
-                json_data[f] = getattr(model, f)
-            return json_data
-
-        elif exclude:
-            for f in model._meta.fields:
-                if f.name not in exclude:
-                    json_data[f.name] = getattr(model, f.name)
-            return json_data
-
-        else:
-            for f in model._meta.fields:
-                json_data[f.name] = getattr(model, f.name)
-            return json_data
+        for f in opts.fields:
+            if fields and f.name not in fields:
+                continue
+            if exclude and f.name in exclude:
+                continue
+            json_data[f.name] = f.value_from_object(model)
+        return json_data
 
     elif isinstance(model, models.QuerySet):
         json_data = [model_to_json(m, fields, exclude) for m in model]
@@ -36,20 +28,12 @@ def model_to_json(model, fields=(), exclude=()):
 
 def json_to_model(model_class, dic, fields=(), exclude=()):
     model = model_class()
-    if fields:
-        for key, value in dic.items():
-            if key in fields:
-                setattr(model, key, value)
-        return model
-
-    elif exclude:
-        for key, value in dic.items():
-            if key not in exclude:
-                setattr(model, key, value)
-        return model
-
-    for key, value in dic.items():
-        setattr(model, key, value)
+    for f in model._meta.fields:
+        if fields and f.name not in fields:
+            continue
+        if exclude and f.name in exclude:
+            continue
+        setattr(model, f.name, dic[f.name])
     return model