Skip to content

Commit

Permalink
refactor: remove authorizer and external authorizer attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@maiyerlee
maiyerlee committed Dec 12, 2024
1 parent b868ee2 commit 62b79f9
Show file tree
Hide file tree
Showing 5 changed files with 190 additions and 219 deletions.
8 changes: 0 additions & 8 deletions backend/openapi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,6 @@ paths:
"appropriation_date": "01/10/2023",
"appropriation_term": 1,
"arrangement_type_id": 3,
"authorizer_id": 26,
"description": "Incoming Interagency Agreements",
"expiration_date": "01/09/2024",
"id": 2,
Expand All @@ -1071,7 +1070,6 @@ paths:
"appropriation_date": "01/10/2022",
"appropriation_term": 1,
"arrangement_type_id": 4,
"authorizer_id": 26,
"description": "Child Development Research Fellowship Grant Program",
"expiration_date": "01/09/2023",
"id": 4,
Expand Down Expand Up @@ -1166,8 +1164,6 @@ paths:
properties:
appropriation_term:
type: integer
authorizer_id:
type: integer
arrangement_type_id:
type: integer
number:
Expand Down Expand Up @@ -1221,7 +1217,6 @@ paths:
"appropriation_date": "01/10/2022",
"appropriation_term": 1,
"arrangement_type_id": 4,
"authorizer_id": 26,
"description": "Child Development Research Fellowship Grant Program",
"expiration_date": "01/09/2023",
"id": 4,
Expand Down Expand Up @@ -4089,7 +4084,6 @@ components:
- appropriation_date: "2023-09-01T00:00:00.000000Z"
- appropriation_term: 1
- arrangement_type_id: 2
- authorizer_id: 23
- description: Healthy Marriages Responsible Fatherhood - OFA
- expiration_date: "2023-09-01T00:00:00.000000Z"
- id: 10
Expand All @@ -4106,7 +4100,6 @@ components:
"appropriation_date": "2023-09-01T00:00:00.000000Z",
"appropriation_term": 1,
"arrangement_type_id": 3,
"authorizer_id": 26,
"description": "Incoming Interagency Agreements",
"expiration_date": "2023-09-01T00:00:00.000000Z",
"id": 2,
Expand All @@ -4124,7 +4117,6 @@ components:
"appropriation_date": "2023-09-01T00:00:00.000000Z",
"appropriation_term": 1,
"arrangement_type_id": 4,
"authorizer_id": 26,
"description": "Child Development Research Fellowship Grant Program",
"expiration_date": "2023-09-01T00:00:00.000000Z",
"id": 4,
Expand Down
235 changes: 111 additions & 124 deletions ...rc/components/Agreements/AgreementCANReviewAccordion/AgreementCANReviewAccordion.test.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ const selectedBudgetLines = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -452,7 +451,6 @@ const selectedBudgetLines = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1238,44 +1236,43 @@ const canData = [

const canFundingCardData = {
available_funding: "14300000.00",
cans: [{
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15011, 15017, 15020],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-07-29T14:44:58.757452Z",
description: "Social Science Research and Development",
display_name: "G99PHS9",
division_id: 6,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 502,
managing_portfolio: 8,
portfolio_id: 8,
nick_name: "SSRD",
number: "G99PHS9",
projects: [],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-07-29T14:44:58.757452Z",
versions: [
{
id: 502,
transaction_id: 208
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2024",
}],
cans: [
{
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
budget_line_items: [15011, 15017, 15020],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-07-29T14:44:58.757452Z",
description: "Social Science Research and Development",
display_name: "G99PHS9",
division_id: 6,
expiration_date: "2024-09-01T00:00:00.000000Z",
funding_sources: [26],
id: 502,
managing_portfolio: 8,
portfolio_id: 8,
nick_name: "SSRD",
number: "G99PHS9",
projects: [],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-07-29T14:44:58.757452Z",
versions: [
{
id: 502,
transaction_id: 208
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2024"
}
],
carry_forward_funding: 0,
expected_funding: "5000000.00",
in_draft_funding: 0,
Expand All @@ -1289,44 +1286,43 @@ const canFundingCardData = {

const canFundingCardData2 = {
available_funding: "1979500.00",
cans: [{
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15018, 15021],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-07-29T14:44:58.941288Z",
description: "Example CAN",
display_name: "G99XXX8",
division_id: 4,
expiration_date: "2023-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 512,
managing_portfolio: 3,
portfolio_id: 3,
nick_name: "",
number: "G99XXX8",
projects: [1000],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-07-29T14:44:58.941288Z",
versions: [
{
id: 512,
transaction_id: 229
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2023",
}],
cans: [
{
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
budget_line_items: [15018, 15021],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-07-29T14:44:58.941288Z",
description: "Example CAN",
display_name: "G99XXX8",
division_id: 4,
expiration_date: "2023-09-01T00:00:00.000000Z",
funding_sources: [26],
id: 512,
managing_portfolio: 3,
portfolio_id: 3,
nick_name: "",
number: "G99XXX8",
projects: [1000],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-07-29T14:44:58.941288Z",
versions: [
{
id: 512,
transaction_id: 229
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2023"
}
],
carry_forward_funding: 0,
expected_funding: "520000.00",
in_execution_funding: 0,
Expand All @@ -1338,44 +1334,43 @@ const canFundingCardData2 = {

const canFundingCard_G994426 = {
available_funding: "37000000.00",
cans: [{
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
authorizer: 26,
authorizer_id: 26,
budget_line_items: [15000, 15001, 15012, 15022, 15023],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-08-02T13:45:56.155989Z",
description: "Head Start Research",
display_name: "G994426",
division_id: 4,
expiration_date: "2024-09-01T00:00:00.000000Z",
external_authorizer_id: null,
funding_sources: [26],
id: 504,
managing_portfolio: 2,
portfolio_id: 2,
nick_name: "HS",
number: "G994426",
projects: [],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-08-02T13:45:56.155989Z",
versions: [
{
id: 504,
transaction_id: 212
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2024",
}],
cans: [
{
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
arrangement_type: "OPRE_APPROPRIATION",
budget_line_items: [15000, 15001, 15012, 15022, 15023],
can_type: null,
created_by: null,
created_by_user: null,
created_on: "2024-08-02T13:45:56.155989Z",
description: "Head Start Research",
display_name: "G994426",
division_id: 4,
expiration_date: "2024-09-01T00:00:00.000000Z",
funding_sources: [26],
id: 504,
managing_portfolio: 2,
portfolio_id: 2,
nick_name: "HS",
number: "G994426",
projects: [],
shared_portfolios: [],
updated_by: null,
updated_by_user: null,
updated_on: "2024-08-02T13:45:56.155989Z",
versions: [
{
id: 504,
transaction_id: 212
}
]
},
carry_forward_label: "Carry-Forward",
expiration_date: "09/01/2024"
}
],
carry_forward_funding: 0,
expected_funding: "16000000.00",
in_execution_funding: "2000000.00",
Expand All @@ -1392,7 +1387,6 @@ const selectedBudgetLinesToAmount = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1467,7 +1461,6 @@ const selectedBudgetLinesToAmount = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1545,7 +1538,6 @@ const selectedBudgetLinesToCans = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1588,7 +1580,6 @@ const selectedBudgetLinesToCans = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1666,7 +1657,6 @@ const selectedBudgetLinesDRAFT_TO_PLANNED = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Head Start Research",
display_name: "G994426",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1721,7 +1711,6 @@ const selectedBudgetLinesDRAFT_TO_PLANNED = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Head Start Research",
display_name: "G994426",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1779,7 +1768,6 @@ const selectedBudgetLines_CAN_and_AMT = [
can: {
appropriation_date: "2022-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Example CAN",
display_name: "G99XXX8",
expiration_date: "2023-09-01T00:00:00.000000Z",
Expand Down Expand Up @@ -1822,7 +1810,6 @@ const selectedBudgetLines_CAN_and_AMT = [
can: {
appropriation_date: "2023-10-01T00:00:00.000000Z",
active_period: 1,
authorizer_id: 26,
description: "Social Science Research and Development",
display_name: "G99PHS9",
expiration_date: "2024-09-01T00:00:00.000000Z",
Expand Down
Loading

0 comments on commit 62b79f9

Please sign in to comment.