Merge pull request #91 from Avanade/sprint-32

Sprint 32
Avanade · Sep 10, 2024 · fdda339 · fdda339
2 parents 3c49df3 + 3031085
commit fdda339
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/src/goapp/routes/pages/approvals/myapprovals.go b/src/goapp/routes/pages/approvals/myapprovals.go
@@ -62,19 +62,23 @@ func MyApprovalsHandler(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	paramsApplication := make(map[string]interface{})
-	paramsApplication["Id"] = items[0]["ApplicationId"]
-
-	application, err := db.ExecuteStoredProcedureWithResult("PR_Applications_Select_ById", paramsApplication)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	} else {
-		if len(application) > 0 {
-			if application[0]["ExportUrl"] != nil {
-				homeData.ExportUrl = application[0]["ExportUrl"].(string)
-			}
-			if application[0]["OrganizationTypeUrl"] != nil {
-				homeData.OrganizationTypeUrl = application[0]["OrganizationTypeUrl"].(string)
+	if items != nil {
+		if items[0]["ApplicationId"] != nil {
+			paramsApplication := make(map[string]interface{})
+			paramsApplication["Id"] = items[0]["ApplicationId"]
+
+			application, err := db.ExecuteStoredProcedureWithResult("PR_Applications_Select_ById", paramsApplication)
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+			} else {
+				if len(application) > 0 {
+					if application[0]["ExportUrl"] != nil {
+						homeData.ExportUrl = application[0]["ExportUrl"].(string)
+					}
+					if application[0]["OrganizationTypeUrl"] != nil {
+						homeData.OrganizationTypeUrl = application[0]["OrganizationTypeUrl"].(string)
+					}
+				}
 			}
 		}
 	}

diff --git a/src/goapp/routes/pages/approvals/myrequests.go b/src/goapp/routes/pages/approvals/myrequests.go
@@ -59,19 +59,23 @@ func MyRequestsHandler(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	paramsApplication := make(map[string]interface{})
-	paramsApplication["Id"] = items[0]["ApplicationId"]
+	if items != nil {
+		if items[0]["ApplicationId"] != nil {
+			paramsApplication := make(map[string]interface{})
+			paramsApplication["Id"] = items[0]["ApplicationId"]
 
-	application, err := db.ExecuteStoredProcedureWithResult("PR_Applications_Select_ById", paramsApplication)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	} else {
-		if len(application) > 0 {
-			if application[0]["ExportUrl"] != nil {
-				homeData.ExportUrl = application[0]["ExportUrl"].(string)
-			}
-			if application[0]["OrganizationTypeUrl"] != nil {
-				homeData.OrganizationTypeUrl = application[0]["OrganizationTypeUrl"].(string)
+			application, err := db.ExecuteStoredProcedureWithResult("PR_Applications_Select_ById", paramsApplication)
+			if err != nil {
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+			} else {
+				if len(application) > 0 {
+					if application[0]["ExportUrl"] != nil {
+						homeData.ExportUrl = application[0]["ExportUrl"].(string)
+					}
+					if application[0]["OrganizationTypeUrl"] != nil {
+						homeData.OrganizationTypeUrl = application[0]["OrganizationTypeUrl"].(string)
+					}
+				}
 			}
 		}
 	}