pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also autopopulate POC info for new requests

Browse Source
This commit is contained in:
richard-dds 2018-08-14 16:30:11 -04:00
parent ac4cf5279e
commit 93ac342f75
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
atst/routes/requests/jedi_request_flow.py
View File

@ -65,7 +65,7 @@ class JEDIRequestFlow(object):
return { return {
"fname_request": user.first_name, "fname_request": user.first_name,
"lname_request": user.last_name, "lname_request": user.last_name,
"email_request": user.email "email_request": user.email,
} }
@property @property
@ -80,7 +80,7 @@ class JEDIRequestFlow(object):
data = self.request.body data = self.request.body
elif self.form_section == "information_about_you": elif self.form_section == "information_about_you":
form_data = self.request.body.get(self.form_section, {}) form_data = self.request.body.get(self.form_section, {})
data = { **self.map_user_data(self.request.creator), **form_data } data = {**self.map_user_data(self.request.creator), **form_data}
else: else:
data = self.request.body.get(self.form_section, {}) data = self.request.body.get(self.form_section, {})
elif self.form_section == "information_about_you": elif self.form_section == "information_about_you":
@ -109,11 +109,7 @@ class JEDIRequestFlow(object):
"section": "information_about_you", "section": "information_about_you",
"form": OrgForm, "form": OrgForm,
}, },
{ {"title": "Workspace Owner", "section": "primary_poc", "form": POCForm},
"title": "Workspace Owner",
"section": "primary_poc",
"form": POCForm,
},
{ {
"title": "Review & Submit", "title": "Review & Submit",
"section": "review_submit", "section": "review_submit",
@ -122,23 +118,26 @@ class JEDIRequestFlow(object):
] ]
def create_or_update_request(self): def create_or_update_request(self):
request_data = self.map_request_data(self.form_section, self.form.data)
if self.request_id: if self.request_id:
self.update_request(self.form_section, self.form.data) Requests.update(self.request_id, request_data)
else: else:
request_data = {self.form_section: self.form.data}
request = Requests.create(self.current_user, request_data) request = Requests.create(self.current_user, request_data)
self.request_id = request.id self.request_id = request.id
def update_request(self, section, data): def map_request_data(self, section, data):
user = (
self.existing_request.creator
if self.existing_request
else self.current_user
)
if section == "primary_poc": if section == "primary_poc":
if data.get("am_poc") == "yes": if data.get("am_poc") == "yes":
data = { data = {
**data, **data,
"dodid_poc": self.existing_request.creator.dod_id, "dodid_poc": user.dod_id,
"fname_poc": self.existing_request.creator.first_name, "fname_poc": user.first_name,
"lname_poc": self.existing_request.creator.last_name, "lname_poc": user.last_name,
"email_poc": self.existing_request.creator.email "email_poc": user.email,
} }
return {section: data}
request_data = {section: data}
Requests.update(self.request_id, request_data)

14
tests/routes/test_request_new.py
View File

@ -139,6 +139,20 @@ def test_not_am_poc_allows_user_to_fill_in_poc_info(client, user_session):
assert ERROR_CLASS not in response.data.decode() assert ERROR_CLASS not in response.data.decode()
def test_not_am_poc_allows_user_to_fill_in_poc_info_for_new_request(client, user_session):
creator = UserFactory.create()
user_session(creator)
response = client.post(
"/requests/new/3",
headers={"Content-Type": "application/x-www-form-urlencoded"},
data="am_poc=yes",
)
request_id = response.headers["Location"].split('/')[-1]
request = Requests.get(request_id)
assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id
def test_can_review_data(user_session, client): def test_can_review_data(user_session, client):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)