CP

Author: adamdickmeiss

broker/oapi/open-api.yaml

@@ -1849,7 +1849,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/PatronRequest'
+              $ref: '#/components/schemas/CreatePatronRequest'
       responses:
         '200':
           description: Patron request updated successfully

broker/patron_request/api/api-handler.go

@@ -550,7 +550,20 @@ func (a *PatronRequestApiHandler) PutPatronRequestsId(w http.ResponseWriter, r *
 	if !a.checkOwnership(w, ctx, existingPr.Side, existingPr.RequesterSymbol, existingPr.SupplierSymbol, nil, tenant) {
 		return
 	}
-	existingPr.IllRequest = newPr.IllRequest
+	newPr.RequesterSymbol = &symbol
+	creationTime := pgtype.Timestamp{Valid: true, Time: time.Now()}
+	illRequest, requesterReqId, err := a.parseAndValidateIllRequest(ctx, &newPr, creationTime.Time)
+	if err != nil {
+		if errors.Is(err, errInvalidPatronRequest) {
+			api.AddBadRequestError(ctx, w, err)
+			return
+		}
+		api.AddInternalError(ctx, w, err)
+		return
+	}
+
+	existingPr.RequesterReqID = getDbText(&requesterReqId)
+	existingPr.IllRequest = illRequest
 	existingPr.Patron = getDbText(newPr.Patron)
 	existingPr.InternalNote = getDbText(newPr.InternalNote)
 	updatedPr, err := a.prRepo.UpdatePatronRequest(ctx, pr_db.UpdatePatronRequestParams(existingPr))

broker/patron_request/api/api-handler_test.go

@@ -1551,3 +1551,32 @@ func TestPutPatronRequestsIdOK(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, id, response.Id)
 }
+
+func TestPutPatronRequestsIdEmptyIllRequest(t *testing.T) {
+	handler := NewPrApiHandler(new(PrRepoError), mockEventBus, mockEventRepo, tenant.NewResolver(), nil, 10)
+	handler.SetIllRepo(new(illRepoNoTx))
+	id := "3"
+	body := proapi.CreatePatronRequest{Id: &id, RequesterSymbol: &symbol}
+	// IllRequest is zero-valued, which parseAndValidateIllRequest rejects as errInvalidPatronRequest
+	jsonBytes, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PUT", "/", bytes.NewBuffer(jsonBytes))
+	rr := httptest.NewRecorder()
+	handler.PutPatronRequestsId(rr, req, "3", proapi.PutPatronRequestsIdParams{})
+	assert.Equal(t, http.StatusBadRequest, rr.Code)
+	assert.Contains(t, rr.Body.String(), "illRequest must not be empty")
+}
+
+func TestPutPatronRequestsIdInvalidBrokerSymbol(t *testing.T) {
+	handler := NewPrApiHandler(new(PrRepoError), mockEventBus, mockEventRepo, tenant.NewResolver(), nil, 10)
+	handler.SetIllRepo(new(illRepoNoTx))
+	previousBrokerSymbol := brokerSymbol
+	brokerSymbol = "BROKER"
+	defer func() {
+		brokerSymbol = previousBrokerSymbol
+	}()
+	req, _ := http.NewRequest("PUT", "/", putBody(t, "3", validIllRequest()))
+	rr := httptest.NewRecorder()
+	handler.PutPatronRequestsId(rr, req, "3", proapi.PutPatronRequestsIdParams{})
+	assert.Equal(t, http.StatusInternalServerError, rr.Code)
+	assert.Contains(t, rr.Body.String(), "invalid BROKER_SYMBOL")
+}