Refactor

Etiene · May 5, 2016 · b220a1e · b220a1e
1 parent c6187dd
commit b220a1e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 41 deletions.
diff --git a/applications/toolbox.moon b/applications/toolbox.moon
@@ -25,9 +25,7 @@ import
   modules
   from require "secrets.toolbox"
 
-_modules = {}
-for m in *modules
-  _modules[m.id] = m.name
+_modules = {m.id,m.name for m in *modules}
 
 class MoonRocksToolbox extends lapis.Application
   [transfer_endorses: "/toolbox/transfer"]: require_login respond_to {
@@ -49,10 +47,10 @@ class MoonRocksToolbox extends lapis.Application
             if not follow
               Followings\create {
                 source_user_id: @current_user.id
-                object_type: 1
+                object_type: Followings.object_type.module
                 object_id: m.id
               }
-              @transfer_count = @transfer_count+1
+              @transfer_count += 1
 
       render: "user_settings.import_toolbox"
   }
diff --git a/helpers/toolbox.moon b/helpers/toolbox.moon
@@ -14,33 +14,19 @@ import
   from require "models"
 
 
-_labels = {}
-for l in *labels
-	_labels[l.id] = l.name
-
-_modules = {}
-for m in *modules
-	_modules[m.id] = m.name
+_labels = {l.id,l.name for l in *labels}
+_modules = {m.id,m.name for m in *modules}
 
 class Toolbox
-
-	create_labels_from_dump: =>
-		for l in *labels
-			Labels\create name: l.name
-
-	apply_labels_to_modules: =>
-		for m in *modules
-			mod = Modules\find name: m.name
-			if mod 
-				for l in *(m.labels)
-					label = Labels\find name: _labels[tonumber l]
-					if label 
-						LabelsModules\create module_id: mod.id, label_id: label.id
-
-
-
-
-
-
-
-
+  create_labels_from_dump: =>
+    for l in *labels
+      Labels\create name: l.name
+
+  apply_labels_to_modules: =>
+    for m in *modules
+      mod = Modules\find name: m.name
+      if mod 
+        for l in *m.labels
+          label = Labels\find name: _labels[tonumber l]
+          if label 
+            LabelsModules\create module_id: mod.id, label_id: label.id
diff --git a/models/labels_modules.moon b/models/labels_modules.moon
@@ -7,14 +7,15 @@ class LabelsModules extends Model
   @timestamp: true
 
   @relations: {
-  	{"label", belongs_to: "Labels"}
-  	{"module", belongs_to: "Modules"}
-	}
+    {"label", belongs_to: "Labels"}
+    {"module", belongs_to: "Modules"}
+  }
 
-  @create: (opts={}) =>
+  @primary_key: {"label_id", "module_id"}
 
-		f = safe_insert @, opts
-		true
+  @create: (opts={}) =>
+    f = safe_insert @, opts
+    true
 
   @remove: (label, module) =>
     assert module.id and label.id, "Missing module/label"
@@ -24,5 +25,3 @@ class LabelsModules extends Model
       module_id: module.id
     }
     res
-
-