Skip to content

Commit

Permalink
Removed unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
sab-LC committed Oct 18, 2024
1 parent ed7e44f commit 80f3f2c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 29 deletions.
17 changes: 8 additions & 9 deletions communities/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,14 @@ def handle_community_creation(request, data, subscription_form, env):
affiliation.communities.add(data)
affiliation.save()

if env != 'SANDBOX':
# Adds activity to Hub Activity
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Community",
community_id=data.id,
action_account_type='community'
)
request.session['new_community_id'] = data.id
# Adds activity to Hub Activity
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Community",
community_id=data.id,
action_account_type='community'
)
request.session['new_community_id'] = data.id

except Exception as e:
messages.add_message(
Expand Down
5 changes: 1 addition & 4 deletions communities/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,7 @@ def create_community(request):

if subscription_form.is_valid():
handle_community_creation(request, data, subscription_form, env)
if env == "SANDBOX":
return redirect('dashboard')
else:
return redirect('community-boundary')
return redirect('community-boundary')
return render(request, 'communities/create-community.html', {'form': form, 'user_form': user_form})


Expand Down
8 changes: 4 additions & 4 deletions helpers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -779,22 +779,22 @@ def handle_confirmation_and_subscription(request, subscription_form, user, env):
}
if isinstance(user, Researcher):
subscription_params['researcher'] = user
subscription_params['subscription_type'] = "founding_supporter"
subscription_params['subscription_type'] = "individual"
user.is_subscribed = True

elif isinstance(user, Institution):
subscription_params['institution'] = user
subscription_params['subscription_type'] = "founding_supporter"
subscription_params['subscription_type'] = "small"
user.is_subscribed = True

elif isinstance(user, ServiceProvider):
subscription_params['service_provider'] = user
subscription_params['subscription_type'] = "founding_supporter"
subscription_params['subscription_type'] = "small"
user.is_certified = True

elif isinstance(user, Community):
subscription_params['community'] = user
subscription_params['subscription_type'] = "founding_supporter"
subscription_params['subscription_type'] = "medium"
user.is_member=True
user.is_approved = True

Expand Down
13 changes: 6 additions & 7 deletions institutions/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@ def handle_institution_creation(request, form, subscription_form, env):
affiliation.institutions.add(data)
affiliation.save()

if env != 'SANDBOX':
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Institution",
institution_id=data.id,
action_account_type="institution",
)
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Institution",
institution_id=data.id,
action_account_type="institution",
)
except Exception as e:
messages.add_message(
request,
Expand Down
10 changes: 5 additions & 5 deletions researchers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ def handle_researcher_creation(request, subscription_form, form, orcid_id, orcid
if env == 'PROD':
manage_researcher_mailing_list(request.user.email, True)

# Adds activity to Hub Activity
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Researcher"
)
# Adds activity to Hub Activity
HubActivity.objects.create(
action_user_id=request.user.id,
action_type="New Researcher"
)
except Exception as e:
messages.add_message(
request,
Expand Down

0 comments on commit 80f3f2c

Please sign in to comment.