Skip to content
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.

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

Reporting periods schema changes #280

Merged
merged 1 commit into from
May 21, 2024

Conversation

laurelkorwin
Copy link
Contributor

@laurelkorwin laurelkorwin commented May 21, 2024

This essentially is the same as the changes in 274, but after conversation with @as1729 we are not yet severing the link between reporting periods and organizations. We need to add the UI to collect organization preferences JSON, which will include a reporting period ID, and use that to link uploads to reporting periods. I will file a follow on ticket to remove the link between organization and reporting period when that is done.

Copy link

QA Summary

See our documentation for tips on how to resolve failing QA checks.

QA Check Result
🌐 Web Tests
🔗 API Tests
🐍 Python Tests
📏 ESLint
🧼 Ruff
🧹 TFLint

Test Coverage

Coverage report for api suite
St File % Stmts % Branch % Funcs % Lines Uncovered Line #s
🔴 All files 39.53 17.81 45.49 40.09
🔴  src 0 100 0 0
🔴   server.ts 0 100 0 0 6-13
🟢  src/directives/requireAuth 100 100 100 100
🟢   requireAuth.ts 100 100 100 100
🟡  src/directives/skipAuth 50 100 0 50
🟡   skipAuth.ts 50 100 0 50 13
🔴  src/functions 0 100 0 0
🔴   graphql.ts 0 100 0 0 15-27
🟡  src/functions/processValidationJson 56 50 50 56
🟢   processValidationJson.scenarios.ts 100 100 100 100
🟡   processValidationJson.ts 55.1 50 50 55.1 36-75,95-96,132-140,152-153,168-171,183-184,197
🔴  src/graphql 0 100 100 0
🔴   agencies.sdl.ts 0 100 100 0 1
🔴   expenditureCategories.sdl.ts 0 100 100 0 1
🔴   inputTemplates.sdl.ts 0 100 100 0 1
🔴   organizations.sdl.ts 0 100 100 0 1
🔴   outputTemplates.sdl.ts 0 100 100 0 1
🔴   projects.sdl.ts 0 100 100 0 1
🔴   reportingPeriods.sdl.ts 0 100 100 0 1
🔴   subrecipients.sdl.ts 0 100 100 0 1
🔴   uploadValidations.sdl.ts 0 100 100 0 1
🔴   uploads.sdl.ts 0 100 100 0 1
🔴   users.sdl.ts 0 100 100 0 1
🔴   validationRuleses.sdl.ts 0 100 100 0 1
🔴  src/lib 12.9 8.82 11.49 13.23
🟡   auth.ts 64.7 48.38 57.14 67.34 70-71,77-78,94-95,117,124,127,132-139,163,167
🔴   aws.ts 38.23 12.5 33.33 38.23 46-51,67-90,127-159
🟢   constants.ts 100 100 100 100
🔴   db.ts 45.45 50 50 45.45 15-35,41,43,50
🔴   ec-codes.ts 0 100 100 0 1
🟢   logger.ts 100 100 100 100
🔴   persist-upload.js 0 0 0 0 16-295
🔴   preconditions.ts 0 0 0 0 2-3
🔴   records.js 0 0 0 0 12-214
🔴   templateRules.ts 0 0 0 0
🔴   tracer.ts 0 100 100 0 5-14
🔴   validate-upload.js 0 0 0 0 18-790
🟢   validation-error.ts 83.33 100 50 83.33 22
🔴   validation-rules.js 0 0 0 0 6-194
🟡  src/services/agencies 70.58 0 83.33 70.58
🟢   agencies.scenarios.ts 100 100 100 100
🟡   agencies.ts 68.75 0 83.33 68.75 39-47
🟢  src/services/expenditureCategories 92.3 100 83.33 92.3
🟢   expenditureCategories.scenarios.ts 100 100 100 100
🟢   expenditureCategories.ts 91.66 100 83.33 91.66 46
🟢  src/services/inputTemplates 92.3 100 83.33 92.3
🟢   inputTemplates.scenarios.ts 100 100 100 100
🟢   inputTemplates.ts 91.66 100 83.33 91.66 47
🟡  src/services/organizations 52 100 38.46 52
🟢   organizations.scenarios.ts 100 100 100 100
🟡   organizations.ts 50 100 38.46 50 36-66,89-113
🟢  src/services/outputTemplates 92.3 100 83.33 92.3
🟢   outputTemplates.scenarios.ts 100 100 100 100
🟢   outputTemplates.ts 91.66 100 83.33 91.66 43
🟡  src/services/passage 74.07 62.5 100 74.07
🟡   passage.ts 74.07 62.5 100 74.07 18-19,65-76
🟡  src/services/projects 80 100 62.5 80
🟢   projects.scenarios.ts 100 100 100 100
🟡   projects.ts 78.57 100 62.5 78.57 45-51
🟡  src/services/reportingPeriods 66.66 100 45.45 66.66
🟢   reportingPeriods.scenarios.ts 100 100 100 100
🟡   reportingPeriods.ts 64.7 100 45.45 64.7 43-64
🟢  src/services/subrecipients 85.71 100 71.42 85.71
🟢   subrecipients.scenarios.ts 100 100 100 100
🟢   subrecipients.ts 84.61 100 71.42 84.61 47-52
🟡  src/services/uploadValidations 57.14 100 14.28 57.14
🟢   uploadValidations.scenarios.ts 100 100 100 100
🟡   uploadValidations.ts 53.84 100 14.28 53.84 10,16,30,38,45-48
🟢  src/services/uploads 86.04 75 76.19 86.04
🟢   uploads.scenarios.ts 100 100 100 100
🟢   uploads.ts 81.81 75 58.33 81.81 31,107-121
🟢  src/services/users 94.73 90 91.66 94.73
🟢   users.scenarios.ts 100 100 100 100
🟢   users.ts 94.11 90 88.23 94.11 226-228,234-237
🟢  src/services/validationRuleses 85.71 100 71.42 85.71
🟢   validationRuleses.scenarios.ts 100 100 100 100
🟢   validationRuleses.ts 84.61 100 71.42 84.61 43-48
Coverage report for web suite
St File % Stmts % Branch % Funcs % Lines Uncovered Line #s
🔴 All files 13.6 14.43 11.52 12.94
🟢  api/src/lib 100 100 100 100
🟢   constants.ts 100 100 100 100
🔴  web/src 28.57 18.75 66.66 28.57
🔴   App.tsx 0 0 0 0 3-36
🟢   Routes.tsx 100 100 100 100
🟡   auth.ts 50 50 100 50 19-24
🔴   entry.client.tsx 0 0 100 0 10-22
🔴  web/src/auth 7.14 0 4.16 7.14
🔴   localAuth.ts 9.09 0 8.33 9.09 39-68,76-80
🔴   passageAuth.ts 5 0 0 5 22-25,31-60
🔴  web/src/components/Agency/Agencies 0 100 0 0
🔴   Agencies.tsx 0 100 0 0 9-21
🔴  web/src/components/Agency/AgenciesCell 0 100 0 0
🔴   AgenciesCell.tsx 0 100 0 0 8-39
🔴  web/src/components/Agency/Agency 0 0 0 0
🔴   Agency.tsx 0 0 0 0 10-78
🔴  web/src/components/Agency/AgencyCell 0 100 0 0
🔴   AgencyCell.tsx 0 100 0 0 7-27
🔴  web/src/components/Agency/AgencyForm 0 0 0 0
🔴   AgencyForm.tsx 0 0 0 0 25-45
🔴  web/src/components/Agency/EditAgencyCell 0 100 0 0
🔴   EditAgencyCell.tsx 0 100 0 0 10-59
🔴  web/src/components/Agency/NewAgency 0 100 0 0
🔴   NewAgency.tsx 0 100 0 0 9-35
🟢  web/src/components/Navigation 100 37.5 100 100
🟢   Navigation.tsx 100 37.5 100 100 26-70
🔴  web/src/components/Organization/EditOrganizationCell 0 100 0 0
🔴   EditOrganizationCell.tsx 0 100 0 0 13-62
🔴  web/src/components/Organization/EditOrganizationForm 0 0 0 0
🔴   EditOrganizationForm.tsx 0 0 0 0 27-41
🔴  web/src/components/Organization/NewOrganization 0 100 0 0
🔴   NewOrganization.tsx 0 100 0 0 9-37
🔴  web/src/components/Organization/NewOrganizationForm 0 0 0 0
🔴   NewOrganizationForm.tsx 0 0 0 0 25-54
🔴  web/src/components/Organization/Organization 0 0 0 0
🔴   Organization.tsx 0 0 0 0 10-70
🔴  web/src/components/Organization/OrganizationCell 0 100 0 0
🔴   OrganizationCell.tsx 0 100 0 0 7-27
🔴  web/src/components/Organization/OrganizationPickListsCell 40.9 0 27.27 36.84
🟡   OrganizationPickListsCell.mock.ts 50 100 0 100
🔴   OrganizationPickListsCell.stories.tsx 0 0 0 0 6-32
🟡   OrganizationPickListsCell.tsx 72.72 100 50 66.66 38-63
🔴  web/src/components/Organization/Organizations 0 100 0 0
🔴   Organizations.tsx 0 100 0 0 9-21
🔴  web/src/components/Organization/OrganizationsCell 0 100 0 0
🔴   OrganizationsCell.tsx 0 100 0 0 8-37
🔴  web/src/components/ReportingPeriod/EditReportingPeriodCell 0 100 0 0
🔴   EditReportingPeriodCell.tsx 0 100 0 0 13-76
🔴  web/src/components/ReportingPeriod/NewReportingPeriod 0 100 0 0
🔴   NewReportingPeriod.tsx 0 100 0 0 9-35
🔴  web/src/components/ReportingPeriod/ReportingPeriod 0 0 0 0
🔴   ReportingPeriod.tsx 0 0 0 0 12-105
🔴  web/src/components/ReportingPeriod/ReportingPeriodCell 0 100 0 0
🔴   ReportingPeriodCell.tsx 0 100 0 0 7-34
🔴  web/src/components/ReportingPeriod/ReportingPeriodForm 0 0 0 0
🔴   ReportingPeriodForm.tsx 0 0 0 0 18-43
🔴  web/src/components/ReportingPeriod/ReportingPeriods 0 0 0 0
🔴   ReportingPeriods.tsx 0 0 0 0 13-98
🔴  web/src/components/ReportingPeriod/ReportingPeriodsCell 0 100 0 0
🔴   ReportingPeriodsCell.tsx 0 100 0 0 8-44
🟡  web/src/components/ReportingPeriodsCell 57.14 0 60 50
🟢   ReportingPeriodsCell.mock.ts 100 100 100 100
🔴   ReportingPeriodsCell.stories.tsx 0 0 0 0 6-32
🟢   ReportingPeriodsCell.tsx 100 100 100 100
🔴  web/src/components/TableBuilder 0 0 0 0
🔴   DebouncedInput.tsx 0 0 0 0 13-32
🔴   Filter.tsx 0 0 0 0 6-15
🔴   TableBuilder.tsx 0 0 0 0 22-70
🔴   TableHeader.tsx 0 0 0 0 5-42
🔴   TableRow.tsx 0 100 0 0 3-7
🟡  web/src/components/TemplateUploadReportingPeriodCell 55 0 55.55 47.05
🟢   TemplateUploadReportingPeriodCell.mock.ts 100 100 100 100
🔴   TemplateUploadReportingPeriodCell.stories.tsx 0 0 0 0 11-37
🟢   TemplateUploadReportingPeriodCell.tsx 100 100 100 100
🔴  web/src/components/Upload/EditUploadCell 0 100 0 0
🔴   EditUploadCell.tsx 0 100 0 0 10-66
🔴  web/src/components/Upload/NewUpload 0 100 0 0
🔴   NewUpload.tsx 0 100 0 0 8-38
🔴  web/src/components/Upload/Upload 0 0 0 0
🔴   Upload.stories.tsx 0 100 100 0 5-93
🔴   Upload.tsx 0 0 0 0 11-61
🔴  web/src/components/Upload/UploadCell 0 100 0 0
🔴   UploadCell.tsx 0 100 0 0 7-59
🔴  web/src/components/Upload/UploadForm 0 0 0 0
🔴   UploadForm.tsx 0 0 0 0 19-99
🔴  web/src/components/Upload/UploadValidationButtonGroup 0 0 0 0
🔴   UploadValidationButtonGroup.stories.tsx 0 100 0 0 5-47
🔴   UploadValidationButtonGroup.tsx 0 0 0 0 24-57
🔴  web/src/components/Upload/UploadValidationResultsTable 42.85 100 100 42.85
🔴   UploadValidationResultsTable.stories.tsx 0 100 100 0 6-41
🟢   UploadValidationResultsTable.tsx 100 100 100 100
🔴  web/src/components/Upload/UploadValidationStatus 0 0 0 0
🔴   UploadValidationStatus.tsx 0 0 0 0 3-30
🔴  web/src/components/Upload/Uploads 0 0 0 0
🔴   Uploads.tsx 0 100 0 0 9-17
🔴   columns.tsx 0 0 0 0 7-63
🔴  web/src/components/Upload/UploadsCell 0 100 0 0
🔴   UploadsCell.tsx 0 100 0 0 8-55
🔴  web/src/components/User/EditUserCell 0 100 0 0
🔴   EditUserCell.tsx 0 100 0 0 10-58
🔴  web/src/components/User/NewUser 0 100 0 0
🔴   NewUser.tsx 0 100 0 0 9-32
🔴  web/src/components/User/User 0 0 0 0
🔴   User.tsx 0 0 0 0 10-94
🔴  web/src/components/User/UserCell 0 100 0 0
🔴   UserCell.tsx 0 100 0 0 7-30
🔴  web/src/components/User/UserForm 0 0 0 0
🔴   UserForm.tsx 0 0 0 0 28-202
🔴  web/src/components/User/Users 0 100 0 0
🔴   Users.tsx 0 100 0 0 9-24
🔴  web/src/components/User/UsersCell 0 100 0 0
🔴   UsersCell.tsx 0 100 0 0 8-44
🟡  web/src/layouts/AuthenticatedLayout 60 50 100 60
🔴   AuthenticatedLayout.stories.tsx 0 100 100 0 5-13
🟢   AuthenticatedLayout.tsx 100 50 100 100 24
🟢  web/src/lib 100 100 100 100
🟢   formatters.tsx 100 100 100 100
🟢   seeds.ts 100 100 100 100
🔴  web/src/pages/Agency/AgenciesPage 0 100 0 0
🔴   AgenciesPage.tsx 0 100 0 0 8-12
🔴  web/src/pages/Agency/AgencyPage 0 100 0 0
🔴   AgencyPage.tsx 0 100 0 0 7-8
🔴  web/src/pages/Agency/EditAgencyPage 0 100 0 0
🔴   EditAgencyPage.tsx 0 100 0 0 7-8
🔴  web/src/pages/Agency/NewAgencyPage 0 100 0 0
🔴   NewAgencyPage.tsx 0 100 0 0 3-4
🔴  web/src/pages/FatalErrorPage 0 0 0 0
🔴   FatalErrorPage.tsx 0 0 0 0 15
🟡  web/src/pages/ForbiddenPage 50 100 100 50
🔴   ForbiddenPage.stories.tsx 0 100 100 0 5-13
🟢   ForbiddenPage.tsx 100 100 100 100
🟡  web/src/pages/LoginPage 62.5 75 60 62.5
🔴   LoginPage.stories.tsx 0 100 100 0 5-13
🟡   LoginPage.tsx 71.42 75 60 71.42 24,29-31
🔴  web/src/pages/NotFoundPage 0 100 0 0
🔴   NotFoundPage.tsx 0 100 0 0 2
🔴  web/src/pages/Organization/EditOrganizationPage 0 100 0 0
🔴   EditOrganizationPage.tsx 0 100 0 0 7-8
🔴  web/src/pages/Organization/NewOrganizationPage 0 100 0 0
🔴   NewOrganizationPage.tsx 0 100 0 0 3-4
🔴  web/src/pages/Organization/OrganizationPage 0 100 0 0
🔴   OrganizationPage.tsx 0 100 0 0 7-8
🔴  web/src/pages/Organization/OrganizationsPage 0 100 0 0
🔴   OrganizationsPage.tsx 0 100 0 0 7-8
🔴  web/src/pages/ReportingPeriod/EditReportingPeriodPage 0 100 0 0
🔴   EditReportingPeriodPage.tsx 0...[Comment body truncated]

Copy link

Terraform Summary

Step Result
🖌 Terraform Format & Style
⚙️ Terraform Initialization
🤖 Terraform Validation
📖 Terraform Plan

Hint: If "Terraform Format & Style" failed, run terraform fmt -recursive from the terraform/ directory and commit the results.

Output

Validation Output
Success! The configuration is valid.


Plan Summary
CHANGE RESOURCE
add aws_s3_object.origin_dist_artifact["static/js/AgencyAgenciesPage.46be0282.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/AgencyAgenciesPage.46be0282.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/OrganizationOrganizationsPage.38b4383f.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/OrganizationOrganizationsPage.38b4383f.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodEditReportingPeriodPage.46d76301.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodEditReportingPeriodPage.46d76301.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodNewReportingPeriodPage.ea1a0c06.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodNewReportingPeriodPage.ea1a0c06.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodPage.94fbe6f4.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodPage.94fbe6f4.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodsPage.883dfb33.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodsPage.883dfb33.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UploadUploadPage.db70df3d.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UploadUploadPage.db70df3d.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UserUserPage.1a371291.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UserUserPage.1a371291.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UserUsersPage.ff402caf.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UserUsersPage.ff402caf.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/app.d1f15f6d.js"]
aws_s3_object.origin_dist_artifact["static/js/app.d1f15f6d.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/runtime-app.ebabad0c.js"]
update aws_ecs_service.console
aws_s3_object.origin_dist_artifact["200.html"]
aws_s3_object.origin_dist_artifact["build-manifest.json"]
aws_s3_object.origin_dist_artifact["chunk-references.json"]
aws_s3_object.origin_dist_artifact["index.html"]
module.lambda_function-cpfValidation.aws_lambda_function.this[0]
module.lambda_function-graphql.aws_lambda_function.this[0]
module.lambda_function-processValidationJson.aws_lambda_function.this[0]
recreate aws_ecs_task_definition.console
aws_s3_object.lambda_artifact-graphql
aws_s3_object.lambda_artifact-processValidationJson
aws_s3_object.lambda_artifact-python
module.lambda_function-cpfValidation.aws_lambda_permission.current_version_triggers["S3BucketNotification"]
module.lambda_function-graphql.aws_lambda_permission.current_version_triggers["APIGateway"]
module.lambda_function-processValidationJson.aws_lambda_permission.current_version_triggers["S3BucketNotification"]
delete aws_s3_object.origin_dist_artifact["static/js/88.8289fa13.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/88.8289fa13.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/AgencyAgenciesPage.b8cb9744.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/AgencyAgenciesPage.b8cb9744.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/OrganizationOrganizationsPage.19057bc7.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/OrganizationOrganizationsPage.19057bc7.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodEditReportingPeriodPage.633facd4.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodEditReportingPeriodPage.633facd4.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodNewReportingPeriodPage.eb52c6cd.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodNewReportingPeriodPage.eb52c6cd.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodPage.8f93c383.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodPage.8f93c383.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodsPage.6d4dd272.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/ReportingPeriodReportingPeriodsPage.6d4dd272.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UploadUploadPage.df792fe4.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UploadUploadPage.df792fe4.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UserUserPage.fa0a0ab7.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UserUserPage.fa0a0ab7.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/UserUsersPage.ee8f1f9a.chunk.js"]
aws_s3_object.origin_dist_artifact["static/js/UserUsersPage.ee8f1f9a.chunk.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/app.b6caf3f1.js"]
aws_s3_object.origin_dist_artifact["static/js/app.b6caf3f1.js.LICENSE.txt"]
aws_s3_object.origin_dist_artifact["static/js/runtime-app.5f5e698d.js"]

Pusher: @laurelkorwin, Action: pull_request_target, Workflow: Continuous Integration

@laurelkorwin laurelkorwin marked this pull request as ready for review May 21, 2024 22:00
@laurelkorwin laurelkorwin requested a review from as1729 May 21, 2024 22:01
@as1729 as1729 merged commit 19d7028 into main May 21, 2024
22 checks passed
@as1729 as1729 deleted the 217-2024-05-13-reporting-periods-db-changes-final branch May 21, 2024 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2024-05-13 Milestone - Reporting Periods database changes
2 participants