Addressed account cretion issues

communities/utils.py

@@ -59,14 +59,15 @@ def handle_community_creation(request, data, subscription_form, env):
             affiliation.communities.add(data)
             affiliation.save()
 
-            # 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
+            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
 
     except Exception as e:
         messages.add_message(

communities/views.py

@@ -140,20 +140,12 @@ def create_community(request):
             mutable_post_data.update(subscription_data)
             subscription_form = SubscriptionForm(mutable_post_data)
 
-            # If in test site, approve immediately, skip confirmation step
-            if env == 'SANDBOX':
-                data.is_approved = True
-                data.is_member = True
-                data.save()
-
-                # Add to user affiliations
-                affiliation = UserAffiliation.objects.prefetch_related('communities').get(user=request.user)
-                affiliation.communities.add(data)
-                affiliation.save()
-                return redirect('dashboard')
-            elif subscription_form.is_valid():
+            if subscription_form.is_valid():
                 handle_community_creation(request, data,  subscription_form, env)
-                return redirect('community-boundary')
+                if env == "SANDBOX":
+                    return redirect('dashboard')
+                else:
+                    return redirect('community-boundary')
     return render(request, 'communities/create-community.html', {'form': form, 'user_form': user_form})
 
 

helpers/utils.py

@@ -779,19 +779,24 @@ def handle_confirmation_and_subscription(request, subscription_form, user, env):
         }
         if isinstance(user, Researcher):
             subscription_params['researcher'] = user
+            subscription_params['subscription_type'] = "founding_supporter"
             user.is_subscribed = True
 
         elif isinstance(user, Institution):
             subscription_params['institution'] = user
+            subscription_params['subscription_type'] = "founding_supporter"
             user.is_subscribed = True
 
         elif isinstance(user, ServiceProvider):
             subscription_params['service_provider'] = user
+            subscription_params['subscription_type'] = "founding_supporter"
             user.is_certified = True
-        
+
         elif isinstance(user, Community):
             subscription_params['community'] = user
+            subscription_params['subscription_type'] = "founding_supporter"
             user.is_member=True
+            user.is_approved = True
 
         user.save()
         response = Subscription.objects.create(**subscription_params)

institutions/utils.py

@@ -24,12 +24,13 @@ def handle_institution_creation(request, form, subscription_form, env):
             affiliation.institutions.add(data)
             affiliation.save()
 
-            HubActivity.objects.create(
-                action_user_id=request.user.id,
-                action_type="New Institution",
-                institution_id=data.id,
-                action_account_type="institution",
-            )
+            if env != 'SANDBOX':
+                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,

researchers/utils.py

@@ -40,20 +40,21 @@ def handle_researcher_creation(request, subscription_form, form, orcid_id, orcid
             request.user.user_profile.is_researcher = True
             request.user.user_profile.save()
 
-            # sends one email to the account creator
-            # and one to either site admin or support
-            send_researcher_email(request)
-            send_hub_admins_account_creation_email(request, data)
+            if env != 'SANDBOX':
+                # sends one email to the account creator
+                # and one to either site admin or support
+                send_researcher_email(request)
+                send_hub_admins_account_creation_email(request, data)
 
-            # Add researcher to mailing list
-            if env == 'PROD':
-                manage_researcher_mailing_list(request.user.email, True)
+                # Add researcher to mailing list
+                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,