Ruby refactoring, can't seem to get the syntax right - ruby

Question

I'm pretty new at Ruby and I've been asked to help out on a program. For some reason for the life of me I can't get my syntax right. If the agent relationship is none?, I want to unshift both the 'series_system_agent_record_creation_by_agent_relationship' and 'series_system_agent_record_ownership_relationship'. I'm using the && in my code but it's not doing what I need it to do so any help would be much appreciated!
if whitelisted['agent_relationships'].none? {|r| r['jsonmodel_type'] == 'series_system_agent_record_creation_by_agent_relationship'}
whitelisted['agent_relationships'].unshift({
'jsonmodel_type' => 'series_system_agent_record_creation_by_agent_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.creating_agency[0]['ref'],
'relator' => 'created_by',
'start_date' => json.creating_agency[0]['start_date'],
})
end
if whitelisted['agent_relationships'].none? {|r| r['jsonmodel_type'] == 'series_system_agent_record_ownership_relationship'}
whitelisted['agent_relationships'].unshift({
'jsonmodel_type' => 'series_system_agent_record_ownership_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.responsible_agency['ref'],
'relator' => 'is_controlled_by',
'start_date' => json.responsible_agency['start_date'],
})
end
whitelisted['responsible_agency'] = json.responsible_agency
whitelisted['creating_agency'] = json.creating_agency
Sorry just a quick edit. To make sense of this the .none? is because I'm using an outdated version of Ruby for an older program. Not something I can change because it isn't my choice. To add I want to refactor this code. I know it already works. I've already tried a few ways and my head can't wrap my head around how to do it. Eg. I tried
if whitelisted['agent_relationships'].none? {|r| r['jsonmodel_type'] == 'series_system_agent_record_creation_by_agent_relationship' && 'series_system_agent_record_creation_by_agent_relationship'}
whitelisted['agent_relationships'].unshift({
'jsonmodel_type' => 'series_system_agent_record_creation_by_agent_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.creating_agency[0]['ref'],
'relator' => 'created_by',
'start_date' => json.creating_agency[0]['start_date'],
} && {
'jsonmodel_type' => 'series_system_agent_record_creation_by_agent_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.creating_agency[0]['ref'],
'relator' => 'created_by',
'start_date' => json.creating_agency[0]['start_date'],
}
)
end
whitelisted['responsible_agency'] = json.responsible_agency
whitelisted['creating_agency'] = json.creating_agency
Hello again! I've now also tried another method as well and I am not running into any errors however something seems to be wrong as this program is whitelisting relationships that can be passed to a react front end. Now none of the relationships are appearing on the react front end using the code below and although I am not running into any errors, it is still not working.
if whitelisted['agent_relationships'].none? {|r| r['jsonmodel_type'] == 'series_system_agent_record_ownership_relationship' && 'series_system_agent_record_creation_by_agent_relationship'}
[{
'jsonmodel_type' => 'series_system_agent_record_ownership_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.responsible_agency['ref'],
'relator' => 'is_controlled_by',
'start_date' => json.responsible_agency['start_date'],
},{
'jsonmodel_type' => 'series_system_agent_record_creation_by_agent_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => json.creating_agency[0]['ref'],
'relator' => 'created_by',
'start_date' => json.creating_agency[0]['start_date'],
},].each { |hsh| ['agent_relationships'].unshift(hsh) }
end
whitelisted['responsible_agency'] = json.responsible_agency
whitelisted['creating_agency'] = json.creating_agency

Answer 1

From what I understand from initial code you want to add series_system_agent_record_creation_by_agent_relationship default only if it's missing in whitelist. Same with series_system_agent_record_ownership_relationship - add only when it's missing.
However your refactoring tries to add both at a time.
Refactoring is usually a process when you refactor little bit and then it gives you idea what else can be refactored.
I would start with replacing long names.
One of the initial versions could be.
def whatever_the_name
# ...
unless has_agent_relationship_of_type?(whitelisted, 'series_system_agent_record_creation_by_agent_relationship')
creating_agency = json.creating_agency[0]
default_agent_relationship = {
'jsonmodel_type' => 'series_system_agent_record_creation_by_agent_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => creating_agency['ref'],
'relator' => 'created_by',
'start_date' => creating_agency['start_date'],
}
whitelisted['agent_relationships'].unshift(default_agent_relationship)
end
unless has_agent_relationship_of_type?(whitelisted, 'series_system_agent_record_ownership_relationship')
responsible_agency = json.responsible_agency
default_agent_relationship = {
'jsonmodel_type' => 'series_system_agent_record_ownership_relationship',
'relationship_target_record_type' => 'agent_corporate_entity',
'ref' => responsible_agency['ref'],
'relator' => 'is_controlled_by',
'start_date' => responsible_agency['start_date'],
}
whitelisted['agent_relationships'].unshift(default_agent_relationship)
end
# ...
end
def has_agent_relationship_of_type?(whitelisted, type)
whitelisted['agent_relationships'].any? {|r| r['jsonmodel_type'] == type }
end
Of course, this shouldn't be considered the final refactored code. It all depends how far you want to get. But hopefully it helps.