[OSE-300] Credential applications can be cancelled

integration/presentation_exchange_integration_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
-	"github.com/tbd54566975/ssi-service/pkg/service/operation/submission"
+	"github.com/tbd54566975/ssi-service/pkg/service/operation/storage"
 )
 
 var presentationExchangeContext = NewTestContext("PresentationExchange")
@@ -109,7 +109,7 @@ func TestSubmissionFlow(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "false", done)
 
-	reviewOutput, err := ReviewSubmission(submission.ID(opID))
+	reviewOutput, err := ReviewSubmission(storage.StatusObjectID(opID))
 	assert.NoError(t, err)
 	status, err := getJSONElement(reviewOutput, "$.status")
 	assert.NoError(t, err)

pkg/server/server_operation_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tbd54566975/ssi-service/pkg/server/router"
 	"github.com/tbd54566975/ssi-service/pkg/service/operation"
-	"github.com/tbd54566975/ssi-service/pkg/service/operation/submission"
+	opstorage "github.com/tbd54566975/ssi-service/pkg/service/operation/storage"
 	"github.com/tbd54566975/ssi-service/pkg/storage"
 )
 
@@ -28,7 +28,7 @@ func TestOperationsAPI(t *testing.T) {
 		holderSigner, holderDID := getSigner(t)
 		definition := createPresentationDefinition(t, pRouter)
 		submissionOp := createSubmission(t, pRouter, definition.PresentationDefinition.ID, VerifiableCredential(), holderDID, holderSigner)
-		sub := reviewSubmission(t, pRouter, submission.ID(submissionOp.ID))
+		sub := reviewSubmission(t, pRouter, opstorage.StatusObjectID(submissionOp.ID))
 
 		createdID := submissionOp.ID
 		req := httptest.NewRequest(
@@ -257,7 +257,7 @@ func TestOperationsAPI(t *testing.T) {
 			holderSigner, holderDID := getSigner(t)
 			definition := createPresentationDefinition(t, pRouter)
 			submissionOp := createSubmission(t, pRouter, definition.PresentationDefinition.ID, VerifiableCredential(), holderDID, holderSigner)
-			_ = reviewSubmission(t, pRouter, submission.ID(submissionOp.ID))
+			_ = reviewSubmission(t, pRouter, opstorage.StatusObjectID(submissionOp.ID))
 
 			createdID := submissionOp.ID
 			req := httptest.NewRequest(

pkg/server/server_presentation_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/tbd54566975/ssi-service/config"
 	"github.com/tbd54566975/ssi-service/internal/keyaccess"
 	"github.com/tbd54566975/ssi-service/pkg/server/router"
-	opsubmission "github.com/tbd54566975/ssi-service/pkg/service/operation/submission"
+	opstorage "github.com/tbd54566975/ssi-service/pkg/service/operation/storage"
 	"github.com/tbd54566975/ssi-service/pkg/service/presentation"
 	"github.com/tbd54566975/ssi-service/pkg/service/presentation/model"
 	"github.com/tbd54566975/ssi-service/pkg/storage"
@@ -163,14 +163,14 @@ func TestPresentationAPI(t *testing.T) {
 					"id":             "did:web:andresuribe.com",
 				})), holderDID, holderSigner)
 
-			req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("https://ssi-service.com/v1/presentations/submissions/%s", opsubmission.ID(op.ID)), nil)
+			req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("https://ssi-service.com/v1/presentations/submissions/%s", opstorage.StatusObjectID(op.ID)), nil)
 			w := httptest.NewRecorder()
 
-			assert.NoError(ttt, pRouter.GetSubmission(newRequestContextWithParams(map[string]string{"id": opsubmission.ID(op.ID)}), w, req))
+			assert.NoError(ttt, pRouter.GetSubmission(newRequestContextWithParams(map[string]string{"id": opstorage.StatusObjectID(op.ID)}), w, req))
 
 			var resp router.GetSubmissionResponse
 			assert.NoError(ttt, json.NewDecoder(w.Body).Decode(&resp))
-			assert.Equal(ttt, opsubmission.ID(op.ID), resp.Submission.ID)
+			assert.Equal(ttt, opstorage.StatusObjectID(op.ID), resp.Submission.ID)
 			assert.Equal(ttt, definition.PresentationDefinition.ID, resp.Submission.DefinitionID)
 			assert.Equal(ttt, "pending", resp.Submission.Status)
 		})
@@ -218,7 +218,7 @@ func TestPresentationAPI(t *testing.T) {
 			}
 
 			value := newRequestValue(ttt, request)
-			createdID := opsubmission.ID(submissionOp.ID)
+			createdID := opstorage.StatusObjectID(submissionOp.ID)
 			req := httptest.NewRequest(
 				http.MethodPut,
 				fmt.Sprintf("https://ssi-service.com/v1/presentations/submissions/%s/review", createdID),
@@ -243,7 +243,7 @@ func TestPresentationAPI(t *testing.T) {
 			holderSigner, holderDID := getSigner(ttt)
 			definition := createPresentationDefinition(ttt, pRouter)
 			submissionOp := createSubmission(t, pRouter, definition.PresentationDefinition.ID, VerifiableCredential(), holderDID, holderSigner)
-			createdID := opsubmission.ID(submissionOp.ID)
+			createdID := opstorage.StatusObjectID(submissionOp.ID)
 			_ = reviewSubmission(ttt, pRouter, createdID)
 
 			request := router.ReviewSubmissionRequest{
@@ -323,14 +323,14 @@ func TestPresentationAPI(t *testing.T) {
 				{
 					Status: "pending",
 					PresentationSubmission: &exchange.PresentationSubmission{
-						ID:           opsubmission.ID(op.ID),
+						ID:           opstorage.StatusObjectID(op.ID),
 						DefinitionID: definition.PresentationDefinition.ID,
 					},
 				},
 				{
 					Status: "pending",
 					PresentationSubmission: &exchange.PresentationSubmission{
-						ID:           opsubmission.ID(op2.ID),
+						ID:           opstorage.StatusObjectID(op2.ID),
 						DefinitionID: definition.PresentationDefinition.ID,
 					},
 				},
@@ -395,7 +395,7 @@ func TestPresentationAPI(t *testing.T) {
 				{
 					Status: "pending",
 					PresentationSubmission: &exchange.PresentationSubmission{
-						ID:           opsubmission.ID(op.ID),
+						ID:           opstorage.StatusObjectID(op.ID),
 						DefinitionID: definition.PresentationDefinition.ID,
 					},
 				},

pkg/service/manifest/service.go

@@ -271,6 +271,7 @@ func (s Service) ProcessApplicationSubmission(request model.SubmitApplicationReq
 	applicantDID := request.ApplicantDID
 	storageRequest := manifeststg.StoredApplication{
 		ID:             applicationID,
+		Status:         opcredential.StatusFulfilled,
 		ManifestID:     manifestID,
 		ApplicantDID:   applicantDID,
 		Application:    request.Application,

pkg/service/manifest/storage/storage.go

@@ -6,6 +6,7 @@ import (
 	"github.com/goccy/go-json"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"github.com/tbd54566975/ssi-service/pkg/service/operation/credential"
 
 	"github.com/TBD54566975/ssi-sdk/credential/manifest"
 
@@ -16,9 +17,9 @@ import (
 )
 
 const (
-	manifestNamespace    = "manifest"
-	applicationNamespace = "application"
-	responseNamespace    = "response"
+	manifestNamespace = "manifest"
+
+	responseNamespace = "response"
 )
 
 type StoredManifest struct {
@@ -30,6 +31,8 @@ type StoredManifest struct {
 
 type StoredApplication struct {
 	ID             string                         `json:"id"`
+	Status         credential.Status              `json:"status"`
+	Reason         string                         `json:"reason"`
 	ManifestID     string                         `json:"manifestId"`
 	ApplicantDID   string                         `json:"applicantDid"`
 	Application    manifest.CredentialApplication `json:"application"`
@@ -132,11 +135,11 @@ func (ms *Storage) StoreApplication(application StoredApplication) error {
 	if err != nil {
 		return util.LoggingErrorMsgf(err, "could not store application: %s", id)
 	}
-	return ms.db.Write(applicationNamespace, id, applicationBytes)
+	return ms.db.Write(credential.ApplicationNamespace, id, applicationBytes)
 }
 
 func (ms *Storage) GetApplication(id string) (*StoredApplication, error) {
-	applicationBytes, err := ms.db.Read(applicationNamespace, id)
+	applicationBytes, err := ms.db.Read(credential.ApplicationNamespace, id)
 	if err != nil {
 		return nil, util.LoggingErrorMsgf(err, "could not get application: %s", id)
 	}
@@ -152,7 +155,7 @@ func (ms *Storage) GetApplication(id string) (*StoredApplication, error) {
 
 // GetApplications attempts to get all stored applications. It will return those it can even if it has trouble with some.
 func (ms *Storage) GetApplications() ([]StoredApplication, error) {
-	gotApplications, err := ms.db.ReadAll(applicationNamespace)
+	gotApplications, err := ms.db.ReadAll(credential.ApplicationNamespace)
 	if err != nil {
 		return nil, util.LoggingErrorMsg(err, "could not get all applications")
 	}
@@ -173,7 +176,7 @@ func (ms *Storage) GetApplications() ([]StoredApplication, error) {
 }
 
 func (ms *Storage) DeleteApplication(id string) error {
-	if err := ms.db.Delete(applicationNamespace, id); err != nil {
+	if err := ms.db.Delete(credential.ApplicationNamespace, id); err != nil {
 		return util.LoggingErrorMsgf(err, "could not delete application: %s", id)
 	}
 	return nil

pkg/service/operation/credential/response.go

@@ -22,6 +22,8 @@ func (s Status) String() string {
 		return "fulfilled"
 	case StatusRejected:
 		return "rejected"
+	case StatusCancelled:
+		return "cancelled"
 	default:
 		return "unknown"
 	}
@@ -32,4 +34,7 @@ const (
 	StatusPending
 	StatusFulfilled
 	StatusRejected
+	StatusCancelled
 )
+
+const ApplicationNamespace = "application"

pkg/service/operation/storage.go

@@ -7,6 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/tbd54566975/ssi-service/internal/util"
+	"github.com/tbd54566975/ssi-service/pkg/service/operation/credential"
 	opstorage "github.com/tbd54566975/ssi-service/pkg/service/operation/storage"
 	"github.com/tbd54566975/ssi-service/pkg/service/operation/storage/namespace"
 	"github.com/tbd54566975/ssi-service/pkg/service/operation/submission"
@@ -23,9 +24,12 @@ type Storage struct {
 }
 
 func (b Storage) CancelOperation(id string) (*opstorage.StoredOperation, error) {
-	if strings.HasPrefix(id, submission.ParentResource) {
-		_, opData, err := b.db.UpdateValueAndOperation(
-			submission.Namespace, submission.ID(id), storage.NewUpdater(map[string]any{
+	var opData []byte
+	var err error
+	switch {
+	case strings.HasPrefix(id, submission.ParentResource):
+		_, opData, err = b.db.UpdateValueAndOperation(
+			submission.Namespace, opstorage.StatusObjectID(id), storage.NewUpdater(map[string]any{
 				"status": submission.StatusCancelled,
 				"reason": cancelledReason,
 			}),
@@ -34,16 +38,30 @@ func (b Storage) CancelOperation(id string) (*opstorage.StoredOperation, error)
 					"done": true,
 				}),
 			})
-		if err != nil {
-			return nil, errors.Wrap(err, "updating value and op")
-		}
-		var op opstorage.StoredOperation
-		if err = json.Unmarshal(opData, &op); err != nil {
-			return nil, errors.Wrap(err, "unmarshalling data")
-		}
-		return &op, nil
+	case strings.HasPrefix(id, credential.ParentResource):
+		_, opData, err = b.db.UpdateValueAndOperation(
+			credential.ApplicationNamespace, opstorage.StatusObjectID(id), storage.NewUpdater(map[string]any{
+				"status": credential.StatusCancelled,
+				"reason": cancelledReason,
+			}),
+			namespace.FromID(id), id, submission.OperationUpdater{
+				UpdaterWithMap: storage.NewUpdater(map[string]any{
+					"done": true,
+				}),
+			},
+		)
+	default:
+		return nil, errors.New("unrecognized id structure")
+	}
+
+	if err != nil {
+		return nil, errors.Wrap(err, "updating value and op")
+	}
+	var op opstorage.StoredOperation
+	if err = json.Unmarshal(opData, &op); err != nil {
+		return nil, errors.Wrap(err, "unmarshalling data")
 	}
-	return nil, errors.New("unrecognized id structure")
+	return &op, nil
 }
 
 func (b Storage) StoreOperation(op opstorage.StoredOperation) error {

pkg/service/operation/storage/storage.go

@@ -1,6 +1,8 @@
 package storage
 
 import (
+	"strings"
+
 	"go.einride.tech/aip/filtering"
 )
 
@@ -35,3 +37,13 @@ type Storage interface {
 	DeleteOperation(id string) error
 	CancelOperation(id string) (*StoredOperation, error)
 }
+
+// StatusObjectID attempts to parse the submission id from the ID of the operation. This is done by taking the last word
+// that results from splitting the id by "/". On failures, the empty string is returned.
+func StatusObjectID(opID string) string {
+	i := strings.LastIndex(opID, "/")
+	if i == -1 {
+		return ""
+	}
+	return opID[(i + 1):]
+}