#868aawgxb Unexpected behavior during account creation

communities/views.py

@@ -140,18 +140,7 @@ 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')
     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'] = "individual"
             user.is_subscribed = True
 
         elif isinstance(user, Institution):
             subscription_params['institution'] = user
+            subscription_params['subscription_type'] = "small"
             user.is_subscribed = True
 
         elif isinstance(user, ServiceProvider):
             subscription_params['service_provider'] = user
+            subscription_params['subscription_type'] = "service_provide"
             user.is_certified = True
-        
+
         elif isinstance(user, Community):
             subscription_params['community'] = user
+            subscription_params['subscription_type'] = "member"
             user.is_member=True
+            user.is_approved = True
 
         user.save()
         response = Subscription.objects.create(**subscription_params)

researchers/utils.py

@@ -40,14 +40,15 @@ 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(