Skip to content

high security standard storage request table #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rkc7h merged 2 commits into from
Aug 21, 2025
Merged

high security standard storage request table #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5edd089
high security standard storage request table
rvedhere Aug 20, 2025
77e0fc0
table_name_typo _fix
rvedhere Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion app/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ def update_dynamo_db_tables(ticket_response, form_elements_dict, desc_str, proje
table_name = app.config['STANDARD_STORAGE_REQUEST_INFO_TABLE']
app.logger.info(f"table_name:{table_name}")
update_standard_storage_request_info_table(ticket_response, form_elements_dict, desc_str, project_ticket_route, table_name)
elif storage_choice == 'High-Security Research Standard':
table_name = app.config['HIGH_SECURITY_STANDARD_STORAGE_REQUEST_INFO_TABLE']
app.logger.info(f"table_name:{table_name}")
update_high_security_standard_storage_request_info_table(ticket_response, form_elements_dict, desc_str, project_ticket_route, table_name)
else:
app.logger.info(f"Invalid storage choice: {storage_choice}. No updates performed.")
else:
Expand Down Expand Up @@ -196,6 +200,42 @@ def update_standard_storage_request_info_table(ticket_response, form_elements_di
print("Details: {e}")


def update_high_security_standard_storage_request_info_table(ticket_response, form_elements_dict, desc_str, project_ticket_route, table_name):
try:
ticket_id = json.loads(ticket_response)['issueKey']
today = datetime.datetime.now()
formatted_date = today.strftime("%Y-%m-%d %H:%M:%S")
fundingTypeData = updateFundingtype(form_elements_dict)
table_data = {
'ticket_id': ticket_id,
'date': formatted_date,
'company': form_elements_dict.get('company-id', ''),
'business_unit': form_elements_dict.get('business-unit', ''),
'cost_center': form_elements_dict.get('cost-center', ''),
'fund': form_elements_dict.get('fund', ''),
'grant': fundingTypeData.get('grant', ''),
'gift': fundingTypeData.get('gift', ''),
'project': fundingTypeData.get('project', ''),
'designated': fundingTypeData.get('designated', ''),
'bill_amount': form_elements_dict.get('fdm-total', ''),
'program': form_elements_dict.get('program', ''),
'function': form_elements_dict.get('function', ''),
'activity': form_elements_dict.get('activity', ''),
'assignee': form_elements_dict.get('assignee', ''),
'owner_name': form_elements_dict.get('name', ''),
'owner_uid': form_elements_dict.get('uid', ''),
'financial-contact': form_elements_dict.get('financial-contact', ''),
'group_name': form_elements_dict.get('mygroup-ownership', ''),
'share_name': form_elements_dict.get('shared-space-name', ''),
'project_name': project_ticket_route[0],
'descrition': desc_str
}
result = aws_service.insert_into_dynamodb(table_name, table_data)
except Exception as e:
app.log_exception(e)
print("Details: {e}")


def updateFundingtype(form_elements_dict):
funding_type = form_elements_dict.get('funding-type', '')
funding_number = form_elements_dict.get('funding-number', '')
Expand Down Expand Up @@ -224,7 +264,7 @@ def validationForBillingInfo(form_elements_dict):
form_elements_dict[key] = value.strip()

category, allocation_type, storage_choice, request_type = fetch_form_identity_info(form_elements_dict)
if (category == 'Rivanna HPC' and allocation_type == "Purchase Service Units") or (category == 'Storage' and storage_choice in ['Research Standard', 'Research Project'] and request_type in ['new-storage', 'increase-storage', 'decrease-storage']):
if (category == 'Rivanna HPC' and allocation_type == "Purchase Service Units") or (category == 'Storage' and storage_choice in ['Research Standard', 'Research Project', 'High-Security Research Standard'] and request_type in ['new-storage', 'increase-storage', 'decrease-storage']):
fundingTypeData = updateFundingtype(form_elements_dict)
billing_data = {
'company': form_elements_dict.get('company-id', ''),
Expand Down
2 changes: 2 additions & 0 deletions config/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def fetch_connections_info():
}
STANDARD_STORAGE_REQUEST_INFO_TABLE = 'jira_standard_storage_requests_info_dev'
PROJECT_STORAGE_REQUEST_INFO_TABLE = 'jira_project_storage_requests_info_dev'
HIGH_SECURITY_STANDARD_STORAGE_REQUEST_INFO_TABLE = 'jira_high_security_standard_storage_requests_info_dev'
PAID_SU_REQUESTS_INFO_TABLE = 'jira_paid_su_requests_info_dev'

CUSTOMFIELD_VALUES = ('customfield_13076', 'customfield_13096', 'customfield_13090')
Expand Down Expand Up @@ -178,6 +179,7 @@ def fetch_connections_info():

STANDARD_STORAGE_REQUEST_INFO_TABLE = 'jira_standard_storage_requests_info'
PROJECT_STORAGE_REQUEST_INFO_TABLE = 'jira_project_storage_requests_info'
HIGH_SECURITY_STANDARD_STORAGE_REQUEST_INFO_TABLE = 'jira_high_security_standard_storage_requests_info'
PAID_SU_REQUESTS_INFO_TABLE = 'jira_paid_su_requests_info'

KONAMI_ENPOINT_DEFAULT_SENDER = 'nem2p@virginia.edu'
Expand Down
Loading