From 96705e826f19daa4aafb7cf38445362e89c03096 Mon Sep 17 00:00:00 2001
From: Luke Miller <millerluke1364@gmail.com>
Date: Sat, 5 Jun 2021 18:33:18 -0400
Subject: [PATCH] updates modpol instance during reset, add_org request no
 longer has user param, but uses request.user as the first user in the org

---
 modpol/orgs/base.lua          |  3 ++-
 modpol/orgs/requests.lua      | 26 +++++++++++++-------------
 modpol/tests/org_req_test.lua |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/modpol/orgs/base.lua b/modpol/orgs/base.lua
index a57bd98..ca915aa 100644
--- a/modpol/orgs/base.lua
+++ b/modpol/orgs/base.lua
@@ -76,7 +76,8 @@ function modpol.orgs.reset()
     end
 
     modpol.orgs.array[1] = nil
-    modpol.orgs.init_instance()
+    modpol.instance = modpol.orgs.init_instance()
+    
 
     modpol.ocutil.log('Reset all orgs')
     modpol.orgs:record('Resetting all orgs', 'org_reset')
diff --git a/modpol/orgs/requests.lua b/modpol/orgs/requests.lua
index 30d1d20..d532137 100644
--- a/modpol/orgs/requests.lua
+++ b/modpol/orgs/requests.lua
@@ -1,5 +1,5 @@
 modpol.orgs.request_params = {
-    add_org = 2,
+    add_org = 1,
     delete = 0,
     add_member = 1,
     remove_member = 1
@@ -79,18 +79,18 @@ function modpol.orgs:resolve_request(request_id, approve)
         -- there's probably a way to clean this up, the issue is the varying number of commands
         -- ex: self['add_member'](self, 'member_name')
         -- not sure if this is safe, more testing to do
-        print(p[1], p[2])
-        self[request.type](self, p[1], p[2], p[3])
-        
-        -- if request.type == "add_org" then
-        --     self:add_org(p[1])
-        -- elseif request.type == "delete" then
-        --     self:delete()
-        -- elseif request.type == "add_member" then
-        --     self:add_member(p[1])
-        -- elseif request.type == "remove_member" then
-        --     self:remove_member(p[1])
-        -- end
+
+        -- self[request.type](self, p[1], p[2], p[3])
+
+        if request.type == "add_org" then
+            self:add_org(request.params[1], request.user)
+        elseif request.type == "delete" then
+            self:delete()
+        elseif request.type == "add_member" then
+            self:add_member(request.params[1])
+        elseif request.type == "remove_member" then
+            self:remove_member(request.params[1])
+        end
         
     end
     
diff --git a/modpol/tests/org_req_test.lua b/modpol/tests/org_req_test.lua
index 691b62e..000e617 100644
--- a/modpol/tests/org_req_test.lua
+++ b/modpol/tests/org_req_test.lua
@@ -30,7 +30,7 @@ modpol.instance:set_policy("add_org", "consent", false);
 new_request = {
     user = "lukvmil",
     type = "add_org",
-    params = {"new_org", "lukvmil"}
+    params = {"new_org"}
 }
 
 request_id = modpol.instance:make_request(new_request)