cellect-server 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39f977e9ea6d66fa0e1f70111b258a54415e9b2d
-  data.tar.gz: 3fb8918df55b6208c19326c4282a359304df7a1e
+  metadata.gz: a0442b94ebaa41e617b478bd63a25e2db0e12934
+  data.tar.gz: bc98fabf0b03d863de24c3e4bd41965ff0801d87
 SHA512:
-  metadata.gz: e85979e0ec995c4e0d56a7185b5e711a2a3cf17f363a38ed0ce41cee73ed82a178e34a44833d8cf3ecc91b6470f965265276a06dafc47d1bcf4e89f25ee5309b
-  data.tar.gz: f0c8ca0fc594993aa7791e96607cacc7b972ef7e2ae2543b527334c931f26db31ec4492dfab9af451919dc5227b82c97ed89770de11e93574ad4302d37eb8f7f
+  metadata.gz: 8c5f3612dd1dddb835cf6bf71e71315677af66913eacf66c7142abc1d5b5a57e6a2c79faa25eda0b641a0190bbe3cb693f9e58c7ece0ed0ec7d06f650edb151f
+  data.tar.gz: b9b32889cd3ebfc8b2b766715d721a7b0d735bf1a26a1ea91d1c62fe9d0ad520c0db7299837c7aafbfcb3423e157eb755af818176b30cd2ebc944dac96efd459

data/.gitignore

@@ -13,3 +13,5 @@ log/*
 tmp/*
 *.gem
 pkg/*
+*.swp
+ext/

data/lib/cellect/server/adapters/postgres.rb

@@ -13,7 +13,7 @@ module Cellect
         
         def workflow_list
           with_pg do |pg|
-            pg.exec('select * from workflows').collect do |row|
+            pg.exec('SELECT * FROM workflows').collect do |row|
               {
                 'id' => row['id'].to_i,
                 'name' => row['id'],
@@ -27,7 +27,15 @@ module Cellect
         
         def load_data_for(workflow_name)
           with_pg do |pg|
-            pg.exec("select id, priority, group_id from workflow_#{ workflow_name }_subjects").collect do |row|
+            statement = <<-SQL
+              SELECT sms.id as id, sms.priority as priority, sms.subject_set_id as group_id 
+              FROM workflows w
+              JOIN subject_sets_workflows ssw ON (ssw.workflow_id = w.id) 
+              JOIN subject_sets ss ON (ss.id = ssw.subject_set_id) 
+              JOIN set_member_subjects sms ON (s.id = sms.subject_set_id)
+              WHERE w.id = #{ workflow_name } 
+            SQL
+            pg.exec(statement).collect do |row|
               {
                 'id' => row['id'].to_i,
                 'priority' => row['priority'].to_f,
@@ -39,8 +47,12 @@ module Cellect
         
         def load_user(workflow_name, id)
           with_pg do |pg|
-            pg.exec("select subject_id from workflow_#{ workflow_name }_classifications where user_id=#{ id }").collect do |row|
-              row['subject_id'].to_i
+            statement = <<-SQL
+              SELECT subject_ids FROM user_seen_subjects
+              WHERE user_id = #{ id } AND workflow_id = #{ workflow_name }
+            SQL
+            pg.exec(statement).collect do |row|
+              row['subject_ids'].map(&:to_i)
             end
           end
         end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Parrish