Merge pull request #192 from Avanade/sprint-42

Sprint 42

Author: jerricotandelacruz

src/goapp/controller/ip-disclosure/ip-disclosure-controller-interface.go

@@ -4,6 +4,7 @@ import "net/http"
 
 type IpDisclosureController interface {
 	InsertIPDisclosureRequest(w http.ResponseWriter, r *http.Request)
+	UpdateResponse(w http.ResponseWriter, r *http.Request)
 }
 
 type IpDisclosurePageController interface {

src/goapp/controller/ip-disclosure/ip-disclosure-controller.go

@@ -207,7 +207,7 @@ func (c *ipDisclosureController) InsertIPDisclosureRequest(w http.ResponseWriter
 		ApplicationId:       c.Config.GetIPDRAppId(),
 		ApplicationModuleId: c.Config.GetIPDRModuleId(),
 		Emails:              []string{c.Config.GetCTO()},
-		Subject:             "IP Disclosure Request",
+		Subject:             "IP Disclosure Request - " + request.IPTitle,
 		Body:                body,
 		RequesterEmail:      user.Email,
 	}
@@ -262,3 +262,43 @@ func (c *ipDisclosureController) InsertIPDisclosureRequest(w http.ResponseWriter
 
 	w.WriteHeader(http.StatusOK)
 }
+
+func (c *ipDisclosureController) UpdateResponse(w http.ResponseWriter, r *http.Request) {
+	// Decode payload
+	var data model.ResponseCallback
+	err := json.NewDecoder(r.Body).Decode(&data)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	// Update response
+	err = c.Service.IPDisclosureRequest.UpdateResponse(&data)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get IPD Request
+	request, err := c.Service.IPDisclosureRequest.GetIPDRequestByApprovalRequestId(data.ItemId)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Get request item
+	item, err := c.Service.Item.GetItemById(request.ApprovalRequestId)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Send email to requestor
+	err = c.Service.Email.SendIPDRResponseEmail(request, item, c.Config.GetHomeURL())
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

src/goapp/controller/item/item-page-controller.go

@@ -238,7 +238,7 @@ func (c *itemPageController) RespondToItem(w http.ResponseWriter, r *http.Reques
 		Data:                *item,
 		RequireRemarks:      itemIsAuthorized.RequireRemarks,
 		IsApprover:          isApprover, // show remarks and approve/reject buttons
-		AlreadyProcessed:    itemIsAuthorized.IsApproved.Value,
+		AlreadyProcessed:    item.DateResponded != "",
 		ApproverResponse:    approverResponse,
 		ConsultLegalButton:  consultLegalButton,
 		Action:              action,

src/goapp/model/ipdrequest.go

@@ -1,13 +1,19 @@
 package model
 
 type IPDRequest struct {
-	RequestId      int64    `json:"requestId"`
-	RequestorName  string   `json:"requestorName"`
-	RequestorEmail string   `json:"requestorEmail"`
-	IPTitle        string   `json:"title"`
-	IPType         string   `json:"type"`
-	IPDescription  string   `json:"description"`
-	Reason         string   `json:"reason"`
-	InvolvementId  []string `json:"involvementId"`
-	Involvement    []string `json:"involvement"`
+	RequestId         int64    `json:"requestId"`
+	RequestorName     string   `json:"requestorName"`
+	RequestorEmail    string   `json:"requestorEmail"`
+	IPTitle           string   `json:"title"`
+	IPType            string   `json:"type"`
+	IPDescription     string   `json:"description"`
+	Reason            string   `json:"reason"`
+	InvolvementId     []string `json:"involvementId"`
+	Involvement       []string `json:"involvement"`
+	IsApproved        bool     `json:"isApproved"`
+	ApprovalRequestId string   `json:"approvalRequestId"`
+	ApproverRemarks   string   `json:"approverRemarks"`
+	ResponseDate      string   `json:"responseDate"`
+	RespondedBy       string   `json:"respondedBy"`
+	Created           string   `json:"created"`
 }

src/goapp/repository/ipdr-involvement/ipdr-involvement-repository.go

@@ -17,6 +17,29 @@ func NewIpdrInvolvementRepository(db *db.Database) IpdrInvolvementRepository {
 	}
 }
 
+func (r *ipdrInvolvementRepository) GetIpdrInvolvementByRequestId(requestId int64) (involvementIds []string, involvements []string, err error) {
+	row, err := r.Query("PR_IPDRInvolvement_Select_ByIPDRId",
+		sql.Named("RequestId", requestId),
+	)
+
+	if err != nil {
+		return nil, nil, err
+	}
+	defer row.Close()
+
+	result, err := r.RowsToMap(row)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	for _, row := range result {
+		involvementIds = append(involvementIds, strconv.FormatInt(row["InvolvementId"].(int64), 10))
+		involvements = append(involvements, row["InvolvementName"].(string))
+	}
+
+	return involvementIds, involvements, nil
+}
+
 func (r *ipdrInvolvementRepository) InsertIpdrInvolvement(ipdrInvolvement model.IpdrInvolvement) error {
 	involvementId, err := strconv.Atoi(ipdrInvolvement.InvolvementId)
 	if err != nil {

src/goapp/repository/ipdr-involvement/ipdr-invovlement-repository-interface.go

@@ -5,5 +5,6 @@ import (
 )
 
 type IpdrInvolvementRepository interface {
+	GetIpdrInvolvementByRequestId(requestId int64) ([]string, []string, error)
 	InsertIpdrInvolvement(ipdrInvolvement model.IpdrInvolvement) error
-}
+}

src/goapp/repository/ipdrequest/ipdrequest-repository-interface.go

@@ -5,6 +5,8 @@ import (
 )
 
 type IpdRequestRepository interface {
+	GetIpdRequestByApprovalRequestId(approvalRequestId string) (*model.IPDRequest, error)
 	InsertIpdRequest(ipdRequest *model.IPDRequest) (int64, error)
 	UpdateApprovalRequestId(approvalRequestId string, IPDRequestId int64) error
+	UpdateResponse(data *model.ResponseCallback) error
 }

src/goapp/repository/ipdrequest/ipdrequest-repository.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	db "main/infrastructure/database"
 	"main/model"
+	"time"
 )
 
 type ipdRequestRepository struct {
@@ -16,6 +17,57 @@ func NewIpdRequestRepository(db *db.Database) IpdRequestRepository {
 	}
 }
 
+func (r *ipdRequestRepository) GetIpdRequestByApprovalRequestId(approvalRequestId string) (*model.IPDRequest, error) {
+	row, err := r.Query("PR_IPDisclosureRequest_Select_ByApprovalRequestId",
+		sql.Named("ApprovalRequestId", approvalRequestId),
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	defer row.Close()
+
+	result, err := r.RowsToMap(row)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(result) == 0 {
+		return nil, nil
+	}
+
+	ipdRequest := model.IPDRequest{
+		RequestId:         result[0]["Id"].(int64),
+		RequestorName:     result[0]["RequestorName"].(string),
+		RequestorEmail:    result[0]["RequestorEmail"].(string),
+		IPTitle:           result[0]["IPTitle"].(string),
+		IPType:            result[0]["IPType"].(string),
+		IPDescription:     result[0]["IPDescription"].(string),
+		Reason:            result[0]["Reason"].(string),
+		ApprovalRequestId: approvalRequestId,
+		Created:           result[0]["Created"].(time.Time).String(),
+	}
+
+	if result[0]["ResponseDate"] != nil {
+		ipdRequest.ResponseDate = result[0]["ResponseDate"].(time.Time).String()
+	}
+
+	if result[0]["IsApproved"] != nil {
+		ipdRequest.IsApproved = result[0]["IsApproved"].(bool)
+	}
+
+	if result[0]["ApproverRemarks"] != nil {
+		ipdRequest.ApproverRemarks = result[0]["ApproverRemarks"].(string)
+	}
+
+	if result[0]["RespondedBy"] != nil {
+		ipdRequest.RespondedBy = result[0]["RespondedBy"].(string)
+	}
+
+	return &ipdRequest, nil
+}
+
 func (r *ipdRequestRepository) InsertIpdRequest(ipdRequest *model.IPDRequest) (int64, error) {
 	row, err := r.Query("PR_IPDisclosureRequest_Insert",
 		sql.Named("RequestorName", ipdRequest.RequestorName),
@@ -48,3 +100,14 @@ func (r *ipdRequestRepository) UpdateApprovalRequestId(approvalRequestId string,
 
 	return err
 }
+
+func (r *ipdRequestRepository) UpdateResponse(data *model.ResponseCallback) error {
+	_, err := r.Query("PR_IPDisclosureRequest_Update_Response",
+		sql.Named("ApprovalRequestId", data.ItemId),
+		sql.Named("IsApproved", data.IsApproved),
+		sql.Named("ApproverRemarks", data.Remarks),
+		sql.Named("RespondedBy", data.RespondedBy),
+	)
+
+	return err
+}

src/goapp/repository/item/item-repository.go

@@ -71,7 +71,7 @@ func (r *itemRepository) GetItemById(id string) (*model.Item, error) {
 	}
 
 	if result[0]["DateResponded"] != nil {
-		item.DateResponded = result[0]["DateResponded"].(time.Time).Format("2006-01-02T15:04:05.000Z")
+		item.DateResponded = result[0]["DateResponded"].(time.Time).String()
 	}
 
 	if result[0]["DateSent"] != nil {
@@ -212,7 +212,7 @@ func (r *itemRepository) GetItemsByModuleId(moduleId string, filterOptions model
 		}
 
 		if v["DateResponded"] != nil {
-			item.DateResponded = v["DateResponded"].(time.Time).Format("2006-01-02T15:04:05.000Z")
+			item.DateResponded = v["DateResponded"].(time.Time).String()
 		}
 
 		if v["DateSent"] != nil {

src/goapp/repository/legal-consultation/legal-consultation-repository.go

@@ -57,7 +57,7 @@ func (r *legalConsultationRepository) GetLegalConsultationByEmail(email string,
 		}
 
 		if v["DateResponded"] != nil {
-			item.DateResponded = v["DateResponded"].(time.Time).Format("2006-01-02T15:04:05.000Z")
+			item.DateResponded = v["DateResponded"].(time.Time).String()
 		}
 
 		if v["DateSent"] != nil {