bug fixes

This commit is contained in:
Luke Miller 2021-04-23 22:41:40 -04:00
parent 23d4a54a8e
commit 6d5d93b4b7

View File

@ -92,9 +92,8 @@ end
function modpol.orgs.init_instance()
local error_msg
if modpol.orgs.array[1] then
error_msg = 'Error: instance has already been initialized'
modpol.ocutil.log(error_msg)
return false, error_msg
modpol.ocutil.log('Error: instance has already been initialized')
return false
end
local instance = temp_org()
@ -128,14 +127,15 @@ function modpol.orgs:record(msg, entry_type)
if type(msg) == 'string' and not(modpol.ocutil.str_empty(msg)) then
entry.action_msg = msg
else
print('Error: msg must be a non empty string')
modpol.ocutil.log('Error: msg must be a non empty string')
return false
end
if type(entry_type) == 'string' and not(modpol.ocutil.str_empty(entry_type)) then
entry.entry_type = entry_type
else
print('Error: entry_type must be a non empty string')
modpol.ocutil.log('Error: entry_type must be a non empty string')
print(msg, entry_type)
return false
end
@ -152,21 +152,18 @@ end
-- ex: instance:add_org('town hall')
function modpol.orgs:add_org(name)
if self.id == nil then
error_msg = 'Error: add_org can only be called by another org'
modpol.ocutil.log(error_msg)
return false, error_msg
modpol.ocutil.log('Error: add_org can only be called by another org')
return false
end
if modpol.ocutil.str_empty(name) then
error_msg = 'Error: org name is required'
modpol.ocutil.log(error_msg)
return false, error_msg
modpol.ocutil.log('Error: org name is required')
return false
end
if modpol.orgs.get_org(name) then
error_msg = 'Error: org name is already being used'
modpol.ocutil.log(error_msg)
return false, error_msg
modpol.ocutil.log('Error: org name is already being used')
return false
end
-- creating the child sub org
@ -185,6 +182,7 @@ function modpol.orgs:add_org(name)
modpol.orgs.array[child_org.id] = child_org
self:record('created sub org ' .. name, 'add_org')
modpol.ocutil.log('Created sub org ' .. name)
return child_org
end
@ -195,7 +193,8 @@ end
-- note: "reason" param was removed, can be added back
function modpol.orgs:delete()
if self.id == 1 then
return false, 'Error: cannot delete instance'
modpol.ocutil.log('Error: cannot delete instance')
return false
end
if #self.children > 0 then
@ -207,7 +206,7 @@ function modpol.orgs:delete()
end
modpol.orgs.array[self.id] = 'removed'
print('Removed ' .. self.name .. ': ' .. self.id)
modpol.ocutil.log('Removed ' .. self.name .. ': ' .. self.id)
self:record('Deleted ' .. self.name .. ' and all child orgs', 'del_org')
@ -235,7 +234,8 @@ function modpol.orgs:add_member(user)
-- adds to end if no empty spots
table.insert(self.members, user)
end
self.record('Added member ' .. user, 'add_member')
self:record('Added member ' .. user, 'add_member')
end
-- =======================================
@ -247,7 +247,7 @@ function modpol.orgs:remove_member(user)
if user_index then
self.members[user_index] = ''
end
self.record('Removed member ' .. user, 'del_member')
self:record('Removed member ' .. user, 'del_member')
end
-- ===========================================
@ -299,16 +299,24 @@ function modpol.orgs:make_request(request)
-- makes sure the request has the valid number of parameters
local num_params = modpol.orgs.request_params[request.type]
if num_params == nil then return false end
if num_params == nil then
modpol.ocutil.log("Error: request type is invalid")
return false
end
for k, v in ipairs(request.params) do
num_params = num_params - 1
end
if num_params ~= 0 then return false end
if num_params ~= 0 then
modpol.ocutil.log("Error: request has invalid number of parameters")
return false
end
-- checking to see if identical request already exists
for k, v in ipairs(self.requests) do
if self.comp_req(request, v) == true then
modpol.ocutil.log("Error: request has already been made")
return false
end
end