added shallow folder rendering

app/controllers/db_folders_controller.rb

@@ -2,4 +2,9 @@
 
 
 # Controller for DbFolders
 # Controller for DbFolders
 class DbFoldersController < ApplicationController
 class DbFoldersController < ApplicationController
+  def show
+    folder = DbFolder.find(params[:id])
+    render json: folder, shallow: false
+  end
+
 end
 end

app/models/db.rb

@@ -19,7 +19,7 @@ class Db < ActiveRecord::Base
 
 
   def as_json(options = {})
   def as_json(options = {})
     db = super(except: [:created_at, :updated_at])
     db = super(except: [:created_at, :updated_at])
-    db[:contents] = root_folder.as_json(options)
+    db[:contents] = root_folder.as_json({shallow: false})
     db
     db
   end
   end
 end
 end

app/models/db_folder.rb

@@ -24,10 +24,12 @@ class DbFolder < ActiveRecord::Base
     true
     true
   end
   end
 
 
-  def as_json(_options = {})
+  def as_json(options = {shallow: true})
     folder = super(except: [:created_at, :updated_at])
     folder = super(except: [:created_at, :updated_at])
-    folder[:subfolders] = subfolders.map(&:as_json)
-    folder[:streams] = db_streams.map(&:as_json)
+    if(options[:shallow]== false)
+      folder[:subfolders] = subfolders.map(&:as_json)
+      folder[:streams] = db_streams.map(&:as_json)
+    end
     folder
     folder
   end
   end
 end
 end

app/models/nilm.rb

@@ -6,6 +6,7 @@ class Nilm < ActiveRecord::Base
 
 
   def as_json(_options = {})
   def as_json(_options = {})
     nilm = super(except: [:created_at, :updated_at])
     nilm = super(except: [:created_at, :updated_at])
+    nilm[:db] = db.as_json()
     nilm
     nilm
   end
   end
 end
 end