Models and signup & login views for consumer_user_poc #155

challabeehyv · 2021-02-08T13:26:06Z

Summary

Feature Flag

Product Description

Safety Assurance

Risk label is set correctly
All migrations are backwards compatible and won't block deploy
The set of people pinged as reviewers is appropriate for the level of risk of the change
If QA is part of the safety story, the "Awaiting QA" label is used
I am certain that this PR will not introduce a regression for the reasons below

Automated test coverage

QA Plan

Safety story

Rollback instructions

This PR can be reverted after deploy with no further considerations

proteusvacuum

Great start!

proteusvacuum · 2021-02-08T21:49:06Z

corehq/apps/consumer_user/decorators.py

+from django.urls import reverse
+
+
+def login_required(view_func):


this seems to be copied from https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/domain/decorators.py#L517-L526
Is there a reason you need a new decorator?

Created a new decorator so that we could redirect to consumer_user login if the current user logged in user doesn't have corresponding ConsumerUser instance. ConsumerUserCaseRelationship has relation ship to ConsumerUser. Once he logins corresponding ConsumerUser will be created.

corehq/apps/consumer_user/models.py

corehq/apps/consumer_user/views.py

proteusvacuum · 2021-02-08T21:59:33Z

corehq/apps/consumer_user/views.py

+    consumer_user = ConsumerUser.objects.create(user=user)
+    consumer_user.save()
+    if obj:
+        obj.accepted = True


note so I don't forget: we'll need to update the commcare-caseuserinvitation that created this invitation in the first place here.

proteusvacuum · 2021-02-08T22:08:28Z

When you are ready for a more thorough review (i.e. when more of the spec is complete), please make this as a PR against the upstream repo so our tests and other checks will be run against it.

To ensure you don't have a lot of fomatting and lint changes need to be made, it would be good to ensure you run flake8 (with our settings) against your changes and install the git hooks

…nd did some refactoring

…anges and updating commcare-caseuserinvitation

proteusvacuum

I did a first pass, but will let you clean things up before going through it again.

corehq/apps/consumer_user/migrations/0002_auto_20210209_0743.py

corehq/apps/consumer_user/views.py

corehq/apps/consumer_user/forms/password_reset_form.py

proteusvacuum · 2021-02-18T13:28:31Z

corehq/apps/domain/decorators.py

@@ -519,7 +519,8 @@ def login_required(view_func):
    @wraps(view_func)
    def _inner(request, *args, **kwargs):
        user = request.user
-        if not (user.is_authenticated and user.is_active):
+        couch_user = CouchUser.get_by_username(user.username)


could maybe put this in the middleware as a new variable on request?

Currently redirecting to login page if user does not have corresponding CouchUser. Once the user logins couchuser will be created set on the request object. From subsequent calls as couch_user will be present it wont redirect to login

corehq/apps/consumer_user/utils.py

corehq/apps/consumer_user/urls.py

corehq/apps/consumer_user/tests/test_views.py

corehq/apps/consumer_user/const.py

corehq/apps/consumer_user/forms/consumer_user_authentication_form.py

proteusvacuum · 2021-03-01T21:03:05Z

corehq/apps/consumer_user/models.py

+        self.save(update_fields=['accepted'])
+
+    @classmethod
+    def create_invitation(cls, case_id, domain, opened_by, email):


nit: what's the purpose of this method? In the place you call this, you could just replace this call with ConsumerUserInviation.objects.create(...) right?

Created this before when code was clumsy

proteusvacuum · 2021-03-01T21:12:31Z

corehq/apps/consumer_user/signals.py

+        if invitation:
+            make_invitation_inactive(invitation, case)
+        return
+    elif invitation and email == invitation.email:


Is there a way we can resend an invitation in this case?

Made new changes to signals logic. If we set the status in case_properties to anything other than 'sent' or 'accepted' it should create a new invitation and send a new mail.

corehq/apps/consumer_user/tests/test_views.py

corehq/apps/consumer_user/const.py

proteusvacuum · 2021-03-01T21:25:43Z

corehq/apps/consumer_user/signals.py

-        update_case(case.domain, case.case_id, {'invitation_status': 'sent', 'updated_by': 'patient'})
+def make_invitation_inactive(invitation, case):
+    invitation.make_inactive()
+    ConsumerUserCaseRelationship.objects.filter(case_id=case.case_id,


I still don't think we want this to happen. We should instead block a new invitation being made in this instance.

Made some changes that would block creating new invitation if there is a new ConsumerUserCaseRelationship exists

corehq/apps/hqwebapp/forms.py

corehq/apps/consumer_user/decorators.py

proteusvacuum · 2021-03-01T21:48:54Z

corehq/apps/consumer_user/signals.py

+
+
+def send_email_case_changed_receiver(sender, case, **kwargs):
+    if case.type != CONSUMER_INVITATION_CASE_TYPE:


I think you need to add an extra check here

case.get_case_property(CONSUMER_INVITATION_STATUS) == CONSUMER_INVITATION_SENT

Otherwise you'll end up with an infinite loop.

Once you fix that, you'll see there is still a failing test.

Made the change inside the method. If we keep it at top when the case is closed it wont update the corresponding invitation

corehq/apps/consumer_user/tasks.py

corehq/apps/hqwebapp/forms.py

corehq/apps/consumer_user/signals.py

proteusvacuum · 2021-03-02T21:25:04Z

corehq/apps/consumer_user/tasks.py

+@task
+def create_new_invitation(case_id, domain, opened_by, email):
+    invitation = ConsumerUserInvitation.create_invitation(case_id, domain, opened_by, email)
+    url = '%s%s' % (get_url_base(),


FYI I get this error when running this in celery:

2021-03-02 21:23:54,886: INFO/MainProcess] Received task: corehq.apps.consumer_user.tasks.create_new_invitation[1d1e586c-7ef7-498d-acd6-61372c937621] [2021-03-02 21:23:54,920: ERROR/ForkPoolWorker-6] Task corehq.apps.consumer_user.tasks.create_new_invitation[1d1e586c-7ef7-498d-acd6-61372c937621] raised unexpected: NoReverseMatch("'consumer_user' is not a registered namespace") Traceback (most recent call last): File "/home/frener/.virtualenvs/cchq/lib/python3.8/site-packages/django/urls/base.py", line 75, in reverse extra, resolver = resolver.namespace_dict[ns] KeyError: 'consumer_user' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/frener/.virtualenvs/cchq/lib/python3.8/site-packages/celery/app/trace.py", line 375, in trace_task R = retval = fun(*args, **kwargs) File "/home/frener/.virtualenvs/cchq/lib/python3.8/site-packages/celery/app/trace.py", line 632, in __protected_call__ return self.run(*args, **kwargs) File "/home/frener/dev/dimagi/commcare-hq/corehq/apps/consumer_user/tasks.py", line 24, in create_new_invitation reverse('consumer_user:consumer_user_register', File "/home/frener/.virtualenvs/cchq/lib/python3.8/site-packages/django/urls/base.py", line 86, in reverse raise NoReverseMatch("%s is not a registered namespace" % key) django.urls.exceptions.NoReverseMatch: 'consumer_user' is not a registered namespace

Its working in my local system when I trigger the call directly.

[2021-03-03 10:19:33,850: INFO/MainProcess] Received task: corehq.apps.consumer_user.tasks.create_new_invitation[1138ed38-8487-41f9-8df2-5ff10bdd453c] [2021-03-03 10:19:34,204: WARNING/ForkPoolWorker-6] http://localhost:8000/hq/consumer_user/signup/MjQ:1lHObN:-8hAS0-6c2CSKgckOVNlP60X5Z4/ [2021-03-03 10:19:34,248: INFO/ForkPoolWorker-6] Received Form a61e5f87f4a94f04ac0825ea3636fdae with 0 attachments [2021-03-03 10:19:34,310: INFO/ForkPoolWorker-6] Finished normal processing for Form a61e5f87f4a94f04ac0825ea3636fdae [2021-03-03 10:19:34,313: INFO/ForkPoolWorker-6] Task corehq.apps.consumer_user.tasks.create_new_invitation[1138ed38-8487-41f9-8df2-5ff10bdd453c] succeeded in 0.4627520860012737s: None [2021-03-03 10:20:08,799: INFO/MainProcess] Received task: corehq.apps.consumer_user.tasks.create_new_invitation[e5fd1b81-a816-4b1f-96b0-13cd446b1678] [2021-03-03 10:20:09,169: WARNING/ForkPoolWorker-12] http://localhost:8000/hq/consumer_user/signup/MjU:1lHObw:voZOGBr9qQtJTYLfyIRFPf_DpUY/ [2021-03-03 10:20:09,203: INFO/ForkPoolWorker-12] Received Form eb1e4a8de3c54fbfb79780cc4bcaf3ae with 0 attachments [2021-03-03 10:20:09,272: INFO/ForkPoolWorker-12] Finished normal processing for Form eb1e4a8de3c54fbfb79780cc4bcaf3ae [2021-03-03 10:20:09,276: INFO/ForkPoolWorker-12] Task corehq.apps.consumer_user.tasks.create_new_invitation[e5fd1b81-a816-4b1f-96b0-13cd446b1678] succeeded in 0.4763715970002522s: None [2021-03-03 10:20:15,488: INFO/MainProcess] Received task: corehq.apps.consumer_user.tasks.create_new_invitation[1edfe58b-76c2-431c-b6a8-22f52cbea709] [2021-03-03 10:20:15,863: WARNING/ForkPoolWorker-1] http://localhost:8000/hq/consumer_user/signup/MjY:1lHOc3:fodmjQtbPEgqF-8lyRJpa3NZ_04/ [2021-03-03 10:20:15,893: INFO/ForkPoolWorker-1] Received Form 5ebe229fde2e4ea68c22f4529541d82a with 0 attachments [2021-03-03 10:20:15,951: INFO/ForkPoolWorker-1] Finished normal processing for Form 5ebe229fde2e4ea68c22f4529541d82a [2021-03-03 10:20:15,955: INFO/ForkPoolWorker-1] Task corehq.apps.consumer_user.tasks.create_new_invitation[1edfe58b-76c2-431c-b6a8-22f52cbea709] succeeded in 0.466650219001167s: None [2021-03-03 10:20:16,090: INFO/MainProcess] Received task: corehq.apps.consumer_user.tasks.create_new_invitation[33e3fcae-5e4a-4d3a-91b3-7a922718d73d] [2021-03-03 10:20:16,471: WARNING/ForkPoolWorker-2] http://localhost:8000/hq/consumer_user/signup/Mjc:1lHOc4:hVJ8QRhq3jWPmfuHlxua-1scLos/ [2021-03-03 10:20:16,504: INFO/ForkPoolWorker-2] Received Form cb44518343e446f39fcaa08b806da419 with 0 attachments [2021-03-03 10:20:16,561: INFO/ForkPoolWorker-2] Finished normal processing for Form cb44518343e446f39fcaa08b806da419 [2021-03-03 10:20:16,565: INFO/ForkPoolWorker-2] Task corehq.apps.consumer_user.tasks.create_new_invitation[33e3fcae-5e4a-4d3a-91b3-7a922718d73d] succeeded in 0.4747796890005702s: None

I checked if I missed anything while pushing. I pushed all the changes I made. Can you tell me how are you triggering this task? I will try to replicate in my system

Weird, I was testing by creating a case through an app I built locally. I will try again and see if there is anything with my local setup that was causing this.

proteusvacuum · 2021-03-02T21:39:55Z

corehq/apps/consumer_user/signals.py

+        return
+    email = case.get_case_property('email')
+    status = case.get_case_property(CONSUMER_INVITATION_STATUS)
+    invitation = ConsumerUserInvitation.objects.filter(case_id=case.case_id,


I'm not sure how I didn't catch this before, but this is the wrong case_id. From the spec, this should be the "uuid for the patient/demographic case."
It would be something like:

host_indices = [index for index in case.indices where index.relationship = 'extension'] try: person_case_id = host_indices[0].referenced_id except IndexError: return # the app is set up incorrectly.

We only save case_id, domain in both ConsumerUserInvitation and ConsumerUserCaseRelationship models as mentioned in the document. You want me to store uuid for the patient/demographic case in the case_id right. I tried implementing the above logic but getting host_indices as empty list when I call from tests using create_case. I tried looking at other usages but could n't find anything helpful. Can you share here how to use this correctly?

Also, Since we are now planning to use uuid for the patient/demographic case in the case_id, will update_case work with this reference_id? Should I add a new column in both ConsumerUserInvitation and ConsumerUserCaseRelationship models to store case_id too?

You can create indexed cases like this:

https://github.com/challabeehyv/commcare-hq/blob/consumer_user_poc/corehq/ex-submodules/casexml/apps/case/tests/test_db_accessors.py#L178-L186

So you would need to make both a demographic, and an invitation case in your tests.

We want the CaseRelationship to link to the demographic case, and we would want to store that id on the invitation when it is created to stop a case getting reassigned between the invitation being created and being accepted.

I think if there can only be a single invitation case open for a particular demographic case, we should be able to always get the invitation back (by looking at the reverse indexed cases for one with the invitation type).

However, I agree that it might be better to store both invitation case_id and the demographic case_id on the ConsumerUserInvitation. I don't think you need to add this to the ConsumerUserCaseRelationship.

…migration into one. Storing demographic case id in ConsumerUserCaseRelationShip

proteusvacuum

Do you think this is in a good place for you to open this PR against the upstream repo? I'd like our full test suite to run against it, as well as the code linting tools.

corehq/apps/consumer_user/tests/test_views.py

corehq/apps/hqwebapp/forms.py

…ndling

corehq/apps/consumer_user/apps.py

corehq/apps/consumer_user/templates/p_login.html

corehq/apps/consumer_user/templates/signup.html

corehq/apps/consumer_user/templates/base.html

corehq/apps/consumer_user/templates/base_page.html

corehq/apps/consumer_user/templates/change_contact_details.html

corehq/apps/consumer_user/templates/change_password.html

corehq/apps/consumer_user/views.py

proteusvacuum · 2021-03-10T04:05:01Z

corehq/apps/hqwebapp/forms.py

+    def create_web_user_from_consumer_user(username, password, ip=None, is_domain_admin=True):
+        now = datetime.utcnow()
+
+        new_user = WebUser.create(None, username, password, None, USER_CHANGE_VIA_WEB, is_admin=is_domain_admin)


how does this work without a domain? Or I guess having this set as None is this reason you get the "please create a domain" after you make this account?

Once the consumer user with out corresponding couch_user is logged in for the first time, we are creating the webuser and he sees the above screen

… by orangejenny

…on_obj as per suggestions from kaapstorm

… tests

Models and signup & login views for consumer_user_poc

70c3abd

proteusvacuum reviewed Feb 8, 2021

View reviewed changes

challabeehyv added 2 commits February 9, 2021 23:19

pr suggestions and some fixes

24660a8

send email on receiving sql_case_post_save signal. added unit tests a…

ca0ff9c

…nd did some refactoring

challabeehyv force-pushed the consumer_user_poc branch from 0fe463f to ca0ff9c Compare February 12, 2021 16:13

challabeehyv added 6 commits February 15, 2021 14:55

test case for send_email_case_changed_receiver

a2a4655

restricting access to patient user for domain and other page

8f921e9

encoding invitation id in sign up url and some minor fixes

4eab216

forgot password, update details, creating user

9259888

updated tests and refactored some code

2e55a11

Removed htmls and made some changes based on suggestions

bd1bc56

challabeehyv force-pushed the consumer_user_poc branch from 6b3c3f4 to bd1bc56 Compare February 19, 2021 15:10

challabeehyv added 3 commits February 19, 2021 20:53

fixed column name and merged both the migrations into one

05ff960

column name fixed

71f200d

removed unique_together constraint, consumer_user login as webuser ch…

b6e3f86

…anges and updating commcare-caseuserinvitation

proteusvacuum reviewed Feb 25, 2021

View reviewed changes

Made changes suggested in PR. Did some formatting fixed some issues.

3a48c03

proteusvacuum reviewed Mar 1, 2021

View reviewed changes

challabeehyv added 3 commits March 2, 2021 18:30

Made changes suggested in PR.

5b161a9

Removed same email check in consumer user login form

4132c62

Made some changes to signals logic

6a43641

challabeehyv force-pushed the consumer_user_poc branch from 0d93a50 to 6a43641 Compare March 2, 2021 13:05

proteusvacuum reviewed Mar 2, 2021

View reviewed changes

corehq/apps/consumer_user/tasks.py Outdated Show resolved Hide resolved

corehq/apps/hqwebapp/forms.py Outdated Show resolved Hide resolved

corehq/apps/consumer_user/signals.py Outdated Show resolved Hide resolved

proteusvacuum reviewed Mar 2, 2021

View reviewed changes

challabeehyv added 2 commits March 3, 2021 18:13

PR suggestions and added a test for resending invitiation

1623156

Created new column demographic_case_id in invitation model, squashed …

33f8433

…migration into one. Storing demographic case id in ConsumerUserCaseRelationShip

proteusvacuum reviewed Mar 8, 2021

View reviewed changes

corehq/apps/consumer_user/tests/test_views.py Outdated Show resolved Hide resolved

corehq/apps/hqwebapp/forms.py Outdated Show resolved Hide resolved

Added assertions to check active invitations and removed exception ha…

34b58ad

…ndling

UI Changes

f8de41f

proteusvacuum reviewed Mar 9, 2021

View reviewed changes

corehq/apps/consumer_user/apps.py Outdated Show resolved Hide resolved

Removed duplicate app config

6c47746

proteusvacuum reviewed Mar 9, 2021

View reviewed changes

corehq/apps/consumer_user/templates/p_login.html Outdated Show resolved Hide resolved

corehq/apps/consumer_user/templates/signup.html Outdated Show resolved Hide resolved

proteusvacuum reviewed Mar 10, 2021

View reviewed changes

challabeehyv added 9 commits March 10, 2021 18:56

Changed templates based on PR suggestions

aff9346

Removed unused imports and variables

d90710e

fixed couple of failing tests

08d3e08

Moved Templates to conusmer_user, CDN issue fix and changes suggested…

fce58b3

… by orangejenny

Moved all the code except case type check from signals.py to tasks.py

143bb10

Moved GetOrNoneManger to model utils and made changes to get_invitati…

08fb9e1

…on_obj as per suggestions from kaapstorm

Fixed failing tests, Broke the test_send_email test to five different…

8706645

… tests

Made changes to tasks.py and signals.py as per farid's suggestions

e60c146

Fixed Inanctive InvitationError raising

0e593cd

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Models and signup & login views for consumer_user_poc #155

Models and signup & login views for consumer_user_poc #155

challabeehyv commented Feb 8, 2021

proteusvacuum left a comment

proteusvacuum Feb 8, 2021

proteusvacuum Feb 25, 2021

challabeehyv Feb 27, 2021

proteusvacuum Feb 8, 2021

proteusvacuum commented Feb 8, 2021

proteusvacuum left a comment

proteusvacuum Feb 18, 2021

challabeehyv Feb 27, 2021

proteusvacuum Mar 1, 2021

challabeehyv Mar 2, 2021

proteusvacuum Mar 1, 2021

challabeehyv Mar 2, 2021 •

edited

Loading

proteusvacuum Mar 1, 2021

challabeehyv Mar 2, 2021

proteusvacuum Mar 1, 2021 •

edited

Loading

challabeehyv Mar 2, 2021

proteusvacuum Mar 2, 2021

challabeehyv Mar 3, 2021

challabeehyv Mar 3, 2021

proteusvacuum Mar 4, 2021

proteusvacuum Mar 2, 2021

challabeehyv Mar 3, 2021 •

edited

Loading

proteusvacuum Mar 4, 2021

proteusvacuum left a comment

proteusvacuum Mar 10, 2021

challabeehyv Mar 10, 2021

challabeehyv Mar 10, 2021 •

edited

Loading

		from django.urls import reverse


		def login_required(view_func):



		def send_email_case_changed_receiver(sender, case, **kwargs):
		if case.type != CONSUMER_INVITATION_CASE_TYPE:

Models and signup & login views for consumer_user_poc #155

Are you sure you want to change the base?

Models and signup & login views for consumer_user_poc #155

Conversation

challabeehyv commented Feb 8, 2021

Summary

Feature Flag

Product Description

Safety Assurance

Automated test coverage

QA Plan

Safety story

Rollback instructions

proteusvacuum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

proteusvacuum commented Feb 8, 2021

proteusvacuum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

challabeehyv Mar 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

proteusvacuum Mar 1, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

challabeehyv Mar 3, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

proteusvacuum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

challabeehyv Mar 10, 2021 • edited Loading

Choose a reason for hiding this comment

challabeehyv Mar 2, 2021 •

edited

Loading

proteusvacuum Mar 1, 2021 •

edited

Loading

challabeehyv Mar 3, 2021 •

edited

Loading

challabeehyv Mar 10, 2021 •

edited

Loading