Merge pull request #375 from nci-ats/feat/get-fixes

Feat/get fixes
empowerai · May 26, 2017 · 018bac1 · 018bac1
2 parents 0264031 + c5d3ca8
commit 018bac1
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 152 deletions.
diff --git a/mocks/basic.json b/mocks/basic.json
@@ -306,149 +306,87 @@
 					"200": {
 						"description": "Success",
       					"examples": {
-        					"application/json": {        						
-								"accinstCn": "123456789",
+        					"application/json": {
+								"accinstCn": "4882975010848",
 								"adminOrg": "0102",
-								"authOfficerName": "John Doe",
-								"authOfficerTitle": "Officer",
-								"contCn": "987654321",
-								"contId": "1234",
-								"contName": "Jane Roe",
+								"authOfficerName": null,
+								"authOfficerTitle": null,
+								"contCn": "777833010848",
+								"contId": "PARTNER 2, PERONS1",
+								"contName": null,
 								"contactType": "PERSON",
 								"crExemptInd": "N",
-								"effectiveDate": "2016-06-04",
-								"epermitId": "0102",								
-								"formDesc": "Special Use Application & Permit (Noncommercial Group Uses)",
-								"formName": "FS-2700-3b ",
-								"holderCombKey": "123456789-987654321",
-								"firstName": "Jane",
-								"lastName": "Roe",
+								"effectiveDate": null,
+								"epermitId": "01021495567957048",
+								"firstName": "perons1",
+								"formDesc": "Outfitting & Guiding Special Use Permit",
+								"formName": "FS-2700-4I ",
+								"holderCombKey": "4882975010848-777833010848",
+								"lastName": "Partner 2",
 								"managingOrg": "0102",
 								"orgCode": null,
 								"orgType": null,
 								"personPrefix": null,
-								"purpose": "Permit Purpose",
+								"purpose": "NEW Rafting on the Platt River-org",
 								"remarks": null,
 								"securityId": "0102",
-								"status": "ACCEPTED",
-								"sudsId": "0102",
+								"status": null,
+								"sudsId": "01021495567957048",
 								"addresses": [
-									{
-										"addrCn": "987654321",
-										"addressType": "BILLING",
-										"address1": "1234 Main St",
-										"address2": null,
-										"address3": null,
-										"addressSeq": null,										
-										"cityName": "Washington",
-										"stateCode": "DC",
-										"postalCode": "82555",
-										"combKey": "4882911010848-565662",
-										"contCn": "987654321",
-										"contId": "1234",
-										"contName": "Jane Roe",
-										"contactType": "PERSON",
-										"countryName": "United States of America",
-										"createdDate": "2016-06-04",
-										"email": "[email protected]",
-										"fmmiCustomerNumber": "1234",
-										"modifiedDate": "2016-06-04",										
-										"programArea": "SUDS",
-										"securityId": "0102"										
-									}
-								],
-								"holders": [
-								  {
-								     "combKey": "1095010356-351010356",
-								     "contCn": "351010356",
-								     "contId": "COOLEY RIVER EX",
-								     "contName": "COOLEY RIVER EXPEDITIONS",
-								     "contactType": "ORGANIZATION",
-								     "firstName": null,
-								     "lastName": null,
-								     "orgCode": "COOLEY RIVER EX",
-								     "orgType": "ORGANIZATION",
-								     "personPrefix": null
-								  }
-								],
-								"phones":[
-									{
-										"areaCode":"555",
-										"combKey":"987654321-123456789",
-										"contCn":"987654321",
-										"contId":"1234",
-										"contName":"Jane Roe",
-										"contactType":"PERSON",
-										"extension":null,
-										"internationalCode":null,
-										"phoneNumber":"555-1234",
-										"phoneNumberType":"BUSINESS",
-										"pnCn":"123456789",
-										"programArea":"SUDS",
-										"restrictions":"Test",
-										"securityId":"0102"
-									}
+								{
+									"addrCn": "565894",
+									"address1": "123 Time Rd.",
+									"address2": null,
+									"address3": null,
+									"addressSeq": null,
+									"addressType": "BILLING",
+									"cityName": "Gunston",
+									"combKey": "4882975010848-565894",
+									"contCn": "777833010848",
+									"contId": "PARTNER 2, PERONS1",
+									"contName": null,
+									"contactType": "PERSON",
+									"countryName": "United States of America",
+									"createdDate": "2017-05-23",
+									"email": "[email protected]",
+									"fmmiCustomerNumber": null,
+									"modifiedDate": null,
+									"postalCode": "21555",
+									"programArea": "SUDS",
+									"securityId": "0102",
+									"stateCode": "MO"
+								}
 								],
-								"statuses": [
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-222333-27-JUN-06",
-										"effectiveDate":"2016-06-04",
-										"status":"ACCEPTED",
-										"statusCn":"222333"
-									},
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-222333-20-AUG-05",
-										"effectiveDate":"2016-06-04",
-										"status":"ACCEPTED",
-										"statusCn":"222333"
-									},
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-7776666-12-DEC-05",
-										"effectiveDate":"2016-06-04",
-										"status":"ON HOLD",
-										"statusCn":"7776666"
-									},
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-9998888-11-AUG-06",
-										"effectiveDate":"2016-06-04",
-										"status":"ISSUED",
-										"statusCn":"9998888"
-									},
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-4445555-08-DEC-09",
-										"effectiveDate":"2016-06-04",
-										"status":"CLOSED",
-										"statusCn":"4445555"
-									},
-									{
-										"authOfficerName":"John Doe",
-										"authOfficerTitle":"Officer",
-										"combKey":"1234567890-88882222-28-JUN-06",
-										"effectiveDate":"2016-06-04",
-										"status":"APP APPROVED",
-										"statusCn":"88882222"
-									}
+								"phones": [
+								{
+									"areaCode": "510",
+									"combKey": "4882975010848-604373010848",
+									"contCn": "777833010848",
+									"contId": "PARTNER 2, PERONS1",
+									"contName": null,
+									"contactType": "PERSON",
+									"createdDate": "2017-05-23",
+									"extension": "0",
+									"internationalCode": null,
+									"modifiedDate": null,
+									"phoneNumber": "2224444",
+									"phoneNumberType": "BUSINESS",
+									"pnCn": "604373010848",
+									"programArea": "SUDS",
+									"restrictions": null,
+									"securityId": "0102"
+								}
 								],
+								"statuses": [],
 								"uses": [
-									{
-										"acres": 0,
-										"cn": "987654321",
-										"feeCalculation": "O&G",
-										"primaryFlag": "Y",
-										"useCn": "777778888"
-									}
+								{
+									"acres": 0,
+									"cn": "38076936010848",
+									"feeCalculation": "O&G",
+									"primaryFlag": "Y",
+									"useCn": "170010343"
+								}
 								]
-
         					}
          				}
 					}

diff --git a/src/api.json b/src/api.json
@@ -76,8 +76,8 @@
           "adminOrg": {"default":"", "intake":"adminOrg"},
           "applicantInfo": {
             "contactControlNumber":{"default":"", "intake":"addresses/contCn"},
-            "firstName": {"default":"", "intake":"holders/firstName"},
-            "lastName": {"default":"", "intake":"holders/lastName"},
+            "firstName": {"default":"", "intake":"firstName"},
+            "lastName": {"default":"", "intake":"lastName"},
             "dayPhone": {
                 "areaCode": {"default":0, "intake":"phones/areaCode"},
                 "number": {"default":0, "intake":"phones/phoneNumber"},
@@ -98,7 +98,7 @@
             "mailingZIP": {"default":"", "intake":"addresses/postalCode"},
             "organizationName": {"default":"", "intake":"addresses/contName"},
             "website": {"default":"", "intake":"middleLayer/website"},
-            "orgType": {"default":"", "intake":"holders/orgType"}
+            "orgType": {"default":"", "intake":"orgType"}
           },
           "noncommercialFields": {
             "activityDescription": {"default":"", "intake":"middleLayer/activityDescription"},
@@ -218,8 +218,8 @@
           "adminOrg": {"default":"", "intake":"adminOrg"},
           "applicantInfo": {
             "contactControlNumber":{"default":"", "intake":"addresses/contCn"},
-            "firstName": {"default":"", "intake":"holders/firstName"},
-            "lastName": {"default":"", "intake":"holders/lastName"},
+            "firstName": {"default":"", "intake":"firstName"},
+            "lastName": {"default":"", "intake":"lastName"},
             "dayPhone": {
               "areaCode": {"default":0, "intake":"phones/areaCode"},
               "number": {"default":0, "intake":"phones/phoneNumber"},
@@ -240,7 +240,7 @@
             "mailingZIP": {"default":0, "intake":"addresses/postalCode"},
             "organizationName": {"default":"", "intake":"addresses/contName"},
             "website": {"default":"", "intake":"middleLayer/website"},
-            "orgType": {"default":"", "intake":"holders/orgType"}
+            "orgType": {"default":"", "intake":"orgType"}
           },
           "tempOutfitterFields": {
             "individualIsCitizen": {"default":false, "intake":"middleLayer/individualIsCitizen"},

diff --git a/src/controllers/get.js b/src/controllers/get.js
@@ -44,9 +44,13 @@ function getTopLevelField(intakeField, cnData, getSchema, jsonData, key){
  */
 function getSubLevelField(cnData, getSchema, key, jsonData){
 
-	const addressData = cnData.addresses[0];
-	const phoneData = cnData.phones[0];
-	const holderData = cnData.holders[0];
+	let addressData, phoneData, holderData;
+	if (cnData.addresses){
+		addressData = cnData.addresses[0];
+	}
+	if (cnData.phones){
+		phoneData = cnData.phones[0];
+	}
 	const path = getSchema[key].intake.split('/');
 	let data;
 	switch (path[0]){
@@ -60,7 +64,7 @@ function getSubLevelField(cnData, getSchema, key, jsonData){
 		data = addressData;
 		break;
 	}
-	if (data.hasOwnProperty(path[1])){
+	if (data && data.hasOwnProperty(path[1])){
 		jsonData[key] = data[path[1]];
 	}
 

diff --git a/src/controllers/index.js b/src/controllers/index.js
@@ -109,7 +109,7 @@ function saveAndUploadFiles(req, res, possbileFiles, files, controlNumber, appli
 			}
 		});
 	});
-	async.parallel(asyncTasks, function(err, data){
+	async.parallel(asyncTasks, function(err){
 		if (err){
 			return callback (err);
 		}

diff --git a/src/controllers/store.js b/src/controllers/store.js
@@ -136,7 +136,7 @@ function getFilesZip(controlNumber, dbFiles, res, callback){
 				pipe: res,
 				recursive: true
 			},
-				function (err, result) {
+				function (err) {
 					if (err){
 						console.error(err);
 						return callback(err);

diff --git a/src/routes/api/index.js b/src/routes/api/index.js
@@ -89,7 +89,7 @@ router.use('/*', function(req, res, next){
 });
 
 // api router to controller
-router.use('/*', postUploadFields, function(req, res, next){
+router.use('/*', postUploadFields, function(req, res){
 	controller.routeRequest(req, res);
 });
 

diff --git a/test/authentication.js b/test/authentication.js
@@ -62,12 +62,12 @@ describe('authentication validation', function() {
 			userRole: 'user'
 		};
 
-		db.saveUser(adminUser, function(err, usr){
+		db.saveUser(adminUser, function(err){
 			if (err){
 				return false;
 			}
 			else {
-				db.saveUser(userUser, function(err, usr){
+				db.saveUser(userUser, function(err){
 					if (!err){
 						util.getToken(adminUsername, adminPassword, function(t){
 							token = t; 

diff --git a/test/noncommercial.js b/test/noncommercial.js
@@ -59,7 +59,7 @@ describe('Integration tests - noncommercial', function(){
 			userRole: 'admin'
 		};
 
-		db.saveUser(adminUser, function(err, usr){
+		db.saveUser(adminUser, function(err){
 			if (err){
 				return false;
 			}
@@ -104,7 +104,7 @@ describe('Integration tests - noncommercial', function(){
 	});
 
 	it('should return valid json for noncommercial POST request (contact search - uses existing contact)', function(done) {
-		let noncommercialInput = noncommercialFactory.create();
+		const noncommercialInput = noncommercialFactory.create();
 		noncommercialInput.applicantInfo.firstName = 'Fname';
 		noncommercialInput.applicantInfo.lastName = 'Lname';
 		request(server)
@@ -117,7 +117,7 @@ describe('Integration tests - noncommercial', function(){
 	});
 
 	it('should return valid json with 400 status for noncommercial POST request (contact search - duplicate contacts error)', function(done) {
-		let noncommercialInput = noncommercialFactory.create();
+		const noncommercialInput = noncommercialFactory.create();
 		noncommercialInput.applicantInfo.organizationName = 'Temp Organization';
 		noncommercialInput.applicantInfo.orgType = 'Corporation';
 		request(server)

diff --git a/test/outfitters.js b/test/outfitters.js
@@ -76,7 +76,7 @@ describe('API Routes: permits/special-uses/commercial/outfitters', function() {
 			userRole: 'admin'
 		};
 
-		db.saveUser(adminUser, function(err, usr){
+		db.saveUser(adminUser, function(err){
 			if (err){
 				return false;
 			}
@@ -276,7 +276,7 @@ describe('API Routes: permits/special-uses/commercial/outfitters', function() {
 			})
 			.buffer()
 			.parse(binaryParser)
-			.end(function(err, res) {
+			.end(function(err) {
 				if (err) 
 					return done(err);
 
@@ -317,7 +317,7 @@ describe('tempOutfitters GET/POST zip file validation: ', function(){
 			userRole: 'admin'
 		};
 
-		db.saveUser(adminUser, function(err, usr){
+		db.saveUser(adminUser, function(err){
 			if (err){
 				return false;
 			}
@@ -382,7 +382,7 @@ describe('tempOutfitters GET/POST zip file validation: ', function(){
 			.expect('Content-Type', 'application/zip')
 			.buffer()
 			.parse(binaryParser)
-			.end(function(err, res) {
+			.end(function(err) {
 				if (err) 
 					return done(err);
 

diff --git a/test/test.js b/test/test.js
@@ -52,7 +52,7 @@ describe('FS ePermit API', function() {
 			userRole: 'admin'
 		};
 
-		db.saveUser(adminUser, function(err, usr){
+		db.saveUser(adminUser, function(err){
 			if (err){
 				return false;
 			}