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.

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

chore: update ORI query and add json attributes in backend / frontend #312

Merged
merged 4 commits into from
Nov 15, 2024
Merged

chore: update ORI query and add json attributes in backend / frontend #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a48a6aa
chore: update ORI query and add json attributes in backend / frontend
mishraomp Nov 13, 2024
57159f6
Revert "chore: update ORI query and add json attributes in backend / …
mishraomp Nov 13, 2024
7cef24e
chore: reformat query to not show so many changes
mishraomp Nov 13, 2024
326cc32
chore: reformat query to not show so many changes and add types
mishraomp Nov 13, 2024
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
7 changes: 4 additions & 3 deletions backend/src/v1/ams-oracle-connector/omrr-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI
NULL as "Domestic Septic Tank Sludge",
NULL as "Hatchery Waste",
NULL as "Manure",
NULL as "Milk Processing Waste"
NULL as "Milk Processing Waste",
NULL as "Plant Matter Derived From Processing Plants"
from CORRAL_GENERATED_VIEWS.AUTHORIZATIONOBJECT,
CORRAL_GENERATED_VIEWS.CLIENT,
CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE,
Expand Down Expand Up @@ -66,7 +67,7 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI
Wdrschedule_two.CodeOfPractice = 'Composting Operations'
and AUTHORIZATIONOBJECT.STATUS !='Withdrawn'
Union
Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste"
Select Distinct To_Number(REGISTRATION.REGAUTHORIZATIONNUMBER) As "Authorization Number", DECODE(AUTHORIZATIONTYPE.AUTHORIZATIONNAME, 'Organic Matter Recycling Regulation', 'Notification') As "Authorization Type", Case When Upper (CLIENT.DoingBusinessAs) Is Not Null Then (Case When Upper (CLIENT.DUP_FORMATTEDNAME) Is Not Null Then Upper (CLIENT.DUP_FORMATTEDNAME) Else InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME) End ) ||' doing business as ' || Upper (CLIENT.DoingBusinessAs) Else NVL(Upper (CLIENT.DUP_FORMATTEDNAME), InitCap(CLIENT.FIRSTNAME) || ' ' || InitCap(CLIENT.LASTNAME)) End As "Regulated Party", Decode (REGISTRATION.STATE, 'Cancelled', 'Inactive', 'Expired', 'Inactive', 'Active', 'Active') As "Authorization Status", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.REGISTRATIONDATE) as "Effective/Issue Date", To_Date(CORRAL_GENERATED_VIEWS.REGISTRATION.AmendmentDate) as "Last Amendment Date", ADDRESS_2.INLINEDISPLAY As "Facility Location", REGISTRATION.LATITUDE As "Latitude", -1.0000000*(REGISTRATION.LONGITUDE) As "Longitude", NULL as "Waste Discharge Regulation", CORRAL_GENERATED_VIEWS.REGISTRATION.OMOPERATIONTYPE as "Operation Type", CORRAL_GENERATED_VIEWS.REGISTRATION.OMLANDBASEDTYPEOFPRODUCTION as "Material Land Applied", CORRAL_GENERATED_VIEWS.REGISTRATION.INTENDEDDATESLANDAPPLICATION as "Intended Dates of Land Application", CORRAL_GENERATED_VIEWS.REGISTRATION.OMDESIGNCAPACITY as "Facility Design Capacity (t/y)", CORRAL_GENERATED_VIEWS.REGISTRATION.OMCOMPOSTFACILITYPRODUCTTYPE as "Type of Compost Produced", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.YARDWASTE, 'Y', 'Yes', 'N', 'No') as "Yard Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BIOSOLIDS, 'Y', 'Yes', 'N', 'No') as "Biosolids", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.WHEY, 'Y', 'Yes', 'N', 'No') as "Whey", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.UNTREATUNPROCESSWOODRESIDUALS, 'Y', 'Yes', 'N', 'No') as "Untreated and Unprocessed Wood Residuals", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.POULTRYCARCASSES, 'Y', 'Yes', 'N', 'No') as "Poultry Carcasses", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FISHWASTE, 'Y', 'Yes', 'N', 'No') as "Fish Wastes", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.FOODWASTE, 'Y', 'Yes', 'N', 'No') as "Food Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.BREWERYWASTEWINERYWASTE, 'Y', 'Yes', 'N', 'No') as "Brewary Waste/Wine Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.ANIMALBEDDING, 'Y', 'Yes', 'N', 'No') as "Animal Bedding", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.DOMESTICSEPTICTANKSLUDGE, 'Y', 'Yes', 'N', 'No') as "Domestic Septic Tank Sludge", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.HATCHERYWASTE, 'Y', 'Yes', 'N', 'No') as "Hatchery Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MANURE, 'Y', 'Yes', 'N', 'No') as "Manure", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.MILKPROCESSINGWASTE, 'Y', 'Yes', 'N', 'No') as "Milk Processing Waste", Decode (CORRAL_GENERATED_VIEWS.REGISTRATION.PlantMatterFromProcessingPlant, 'Y','Yes', 'N' , 'No') as "Plant Matter Derived From Processing Plants"
From CORRAL_GENERATED_VIEWS.REGISTRATION, CORRAL_GENERATED_VIEWS.REGISTRATION_2 r2, CORRAL_GENERATED_VIEWS.Bceniccode n, CORRAL_GENERATED_VIEWS.Bceniccode n2, CORRAL_GENERATED_VIEWS.AUTHORIZATIONTYPE, CORRAL_GENERATED_VIEWS.CLIENT, CORRAL_GENERATED_VIEWS.DISCHARGEPOINT, CORRAL_GENERATED_VIEWS.DISCHARGETYPE, CORRAL_GENERATED_VIEWS.ADDRESS, CORRAL_GENERATED_VIEWS.ADDRESS ADDRESS_2, CORRAL_GENERATED_VIEWS.Wdrschedule_One, CORRAL_GENERATED_VIEWS.Wdrschedule_two
Where r2.PRIMARYBCENICID = n.OBJECTID(+)
And r2.SECONDARYBCENICID = n2.OBJECTID(+)
Expand All @@ -80,4 +81,4 @@ export const OMRR_QUERY = `SELECT DISTINCT TO_NUMBER(AUTHORIZATIONOBJECT.AUTHORI
And REGISTRATION.MAILINGADDRESSID = ADDRESS.OBJECTID(+)
And REGISTRATION.ADDRESSID = ADDRESS_2.OBJECTID(+)
and AUTHORIZATIONTYPE.AUTHORIZATIONNAME ='Organic Matter Recycling Regulation'
and REGISTRATION.STATE !='Withdrawn'`;
and REGISTRATION.STATE !='Withdrawn'`;
1 change: 1 addition & 0 deletions backend/src/v1/types/omrr-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ export interface OmrrData {
'Hatchery Waste'?: boolean,
'Manure'?: boolean,
'Milk Processing Waste'?: boolean,
'Plant Matter Derived From Processing Plants'?: boolean,
}
3 changes: 2 additions & 1 deletion frontend/src/interfaces/omrr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default interface OmrrData {
'Hatchery Waste'?: boolean
Manure?: boolean
'Milk Processing Waste'?: boolean

'Plant Matter Derived From Processing Plants'?: boolean,
// Extracted from Facility Location - not all facilities will have this set
'Postal Code'?: string
}
Expand All @@ -47,4 +47,5 @@ export const omrrDataBooleanFields: (keyof OmrrData)[] = [
'Hatchery Waste',
'Manure',
'Milk Processing Waste',
'Plant Matter Derived From Processing Plants'
]
Loading