add schema_url to proofs; fix time format

docs/spec/components/schemas/Link.yaml

@@ -16,5 +16,6 @@ allOf:
             example: '05260b49-2c35-48b9-8300-d39ae48ca312'
           created_at:
             type: string
-            description: The date and time when the proof was created in the timestamp format
-            example: '1702480643'
+            format: time.Time
+            description: The date and time when the proof was created in the RFC3339 format
+            example: "2021-08-12T12:00:00Z"

docs/spec/components/schemas/Proof.yaml

@@ -12,14 +12,16 @@ allOf:
           - proof
           - proof_type
           - org_id
+          - schema_url
         properties:
           creator:
             type: string
             description: The ID of the user who created the proof
           created_at:
             type: string
-            description: The date and time when the proof was created in the timestamp format
-            example: '1702480643'
+            format: time.Time
+            description: The date and time when the proof was created in the RFC3339 format
+            example: "2021-08-12T12:00:00Z"
           proof:
             type: string
             description: The proof object in JSON string format
@@ -30,3 +32,6 @@ allOf:
           org_id:
             type: string
             description: The ID of the organization that issued the proof's claim
+          schema_url:
+            type: string
+            description: The schema URL of the claim the proof was created based on

docs/spec/components/schemas/ProofCreate.yaml

@@ -3,6 +3,7 @@ required:
   - proof
   - proof_type
   - org_id
+  - schema_url
 properties:
   proof:
     type: string
@@ -14,3 +15,6 @@ properties:
   org_id:
     type: string
     description: The ID of the organization that issued the proof's claim
+  schema_url:
+    type: string
+    description: The schema URL of the claim the proof was created based on

internal/assets/migrations/002_proof_schema.sql

@@ -0,0 +1,5 @@
+-- +migrate Up
+alter table proofs add column schema_url text not null default '';
+
+-- +migrate Down
+alter table proofs drop column schema_url;

internal/data/main.go

@@ -6,8 +6,8 @@ import (
 	"github.com/google/uuid"
 )
 
-//go:generate xo schema "postgres://link:link@localhost:15432/link-db?sslmode=disable" -o ./ --single=schema.xo.go --src templates
-//go:generate xo schema "postgres://link:link@localhost:15432/link-db?sslmode=disable" -o pg --single=schema.xo.go --src=pg/templates --go-context=both
+//go:generate xo schema "postgres://link:link@localhost:25432/link-db?sslmode=disable" -o ./ --single=schema.xo.go --src templates
+//go:generate xo schema "postgres://link:link@localhost:25432/link-db?sslmode=disable" -o pg --single=schema.xo.go --src=pg/templates --go-context=both
 //go:generate goimports -w ./
 
 type Storage interface {

internal/services/api/handlers/create_proof.go

@@ -2,16 +2,16 @@ package handlers
 
 import (
 	"encoding/json"
+	"net/http"
+	"time"
+
 	validation "github.com/go-ozzo/ozzo-validation/v4"
 	"github.com/google/uuid"
 	"github.com/rarimo/rarime-link-svc/internal/data"
 	"github.com/rarimo/rarime-link-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 	"gitlab.com/distributed_lab/logan/v3/errors"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 type proofCreateRequest struct {
@@ -40,8 +40,6 @@ func newProofCreateRequest(r *http.Request) (*proofCreateRequest, error) {
 	return &req, nil
 }
 
-// TODO add schema_url; change time format
-
 func CreateProof(w http.ResponseWriter, r *http.Request) {
 	req, err := newProofCreateRequest(r)
 	if err != nil {
@@ -62,6 +60,7 @@ func CreateProof(w http.ResponseWriter, r *http.Request) {
 		Proof:     []byte(req.Data.Proof),
 		Type:      req.Data.ProofType,
 		OrgID:     orgID,
+		SchemaURL: req.Data.SchemaUrl,
 	}
 
 	err = Storage(r).ProofQ().Insert(&proof)
@@ -78,11 +77,12 @@ func CreateProof(w http.ResponseWriter, r *http.Request) {
 				Type: resources.PROOFS,
 			},
 			Attributes: resources.ProofAttributes{
-				CreatedAt: strconv.FormatInt(proof.CreatedAt.Unix(), 10),
+				CreatedAt: proof.CreatedAt,
 				Creator:   proof.Creator,
 				Proof:     string(proof.Proof),
 				ProofType: proof.Type,
 				OrgId:     proof.OrgID.String(),
+				SchemaUrl: req.Data.SchemaUrl,
 			},
 		},
 		Included: resources.Included{},

internal/services/api/handlers/create_proof_link.go

@@ -92,7 +92,7 @@ func CreateProofLink(w http.ResponseWriter, r *http.Request) {
 			},
 			Attributes: resources.LinkAttributes{
 				Link:      linkID.String(),
-				CreatedAt: timestamp.String(),
+				CreatedAt: timestamp,
 			},
 		},
 		Included: resources.Included{},

internal/services/api/handlers/get_links_by_user.go

@@ -8,7 +8,6 @@ import (
 	"gitlab.com/distributed_lab/ape/problems"
 	"gitlab.com/distributed_lab/urlval"
 	"net/http"
-	"strconv"
 )
 
 type proofsLinksByUserDIDRequest struct {
@@ -55,7 +54,7 @@ func GetLinks(w http.ResponseWriter, r *http.Request) {
 					Type: resources.LINKS,
 				},
 				Attributes: resources.LinkAttributes{
-					CreatedAt: strconv.FormatInt(link.CreatedAt.Unix(), 10),
+					CreatedAt: link.CreatedAt,
 					Link:      link.ID.String(),
 				},
 			},

internal/services/api/handlers/get_proof.go

@@ -9,7 +9,6 @@ import (
 	"gitlab.com/distributed_lab/ape/problems"
 	"gitlab.com/distributed_lab/logan/v3/errors"
 	"net/http"
-	"strconv"
 )
 
 type proofByIDRequest struct {
@@ -54,11 +53,12 @@ func ProofByID(w http.ResponseWriter, r *http.Request) {
 				Type: resources.PROOFS,
 			},
 			Attributes: resources.ProofAttributes{
-				CreatedAt: strconv.FormatInt(proof.CreatedAt.Unix(), 10),
+				CreatedAt: proof.CreatedAt,
 				Creator:   proof.Creator,
 				Proof:     string(proof.Proof),
 				ProofType: proof.Type,
 				OrgId:     proof.OrgID.String(),
+				SchemaUrl: proof.SchemaURL,
 			},
 		},
 		Included: resources.Included{},

internal/services/api/handlers/get_proofs_by_link.go

@@ -66,7 +66,7 @@ func GetLinkByID(w http.ResponseWriter, r *http.Request) {
 				Type: resources.LINKS,
 			},
 			Attributes: resources.LinkAttributes{
-				CreatedAt: link.CreatedAt.UTC().String(),
+				CreatedAt: link.CreatedAt,
 				Link:      link.ID.String(),
 			},
 		},
@@ -86,11 +86,12 @@ func GetLinkByID(w http.ResponseWriter, r *http.Request) {
 				Type: resources.PROOFS,
 			},
 			Attributes: resources.ProofAttributes{
-				CreatedAt: proof.CreatedAt.String(),
+				CreatedAt: proof.CreatedAt,
 				Creator:   proof.Creator,
 				Proof:     string(proof.Proof),
 				ProofType: proof.Type,
 				OrgId:     proof.OrgID.String(),
+				SchemaUrl: proof.SchemaURL,
 			},
 		})
 	}

internal/services/api/handlers/get_proofs_by_user.go

@@ -1,14 +1,12 @@
 package handlers
 
 import (
-	"net/http"
-	"strconv"
-
 	validation "github.com/go-ozzo/ozzo-validation/v4"
 	"github.com/rarimo/rarime-link-svc/resources"
 	"gitlab.com/distributed_lab/ape"
 	"gitlab.com/distributed_lab/ape/problems"
 	"gitlab.com/distributed_lab/urlval"
+	"net/http"
 )
 
 type proofsByUserDIDRequest struct {
@@ -57,11 +55,12 @@ func GetProofs(w http.ResponseWriter, r *http.Request) {
 					Type: resources.PROOFS,
 				},
 				Attributes: resources.ProofAttributes{
-					CreatedAt: strconv.FormatInt(proof.CreatedAt.Unix(), 10),
+					CreatedAt: proof.CreatedAt,
 					Creator:   proof.Creator,
 					Proof:     string(proof.Proof),
 					ProofType: proof.Type,
 					OrgId:     proof.OrgID.String(),
+					SchemaUrl: proof.SchemaURL,
 				},
 			},
 		}

resources/model_link_attributes.go

@@ -4,9 +4,11 @@
 
 package resources
 
+import "time"
+
 type LinkAttributes struct {
-	// The date and time when the proof was created in the timestamp format
-	CreatedAt string `json:"created_at"`
+	// The date and time when the proof was created in the RFC3339 format
+	CreatedAt time.Time `json:"created_at"`
 	// UUID Link to proofs
 	Link string `json:"link"`
 }

resources/model_proof_attributes.go

@@ -4,9 +4,11 @@
 
 package resources
 
+import "time"
+
 type ProofAttributes struct {
-	// The date and time when the proof was created in the timestamp format
-	CreatedAt string `json:"created_at"`
+	// The date and time when the proof was created in the RFC3339 format
+	CreatedAt time.Time `json:"created_at"`
 	// The ID of the user who created the proof
 	Creator string `json:"creator"`
 	// The ID of the organization that issued the proof's claim
@@ -15,4 +17,6 @@ type ProofAttributes struct {
 	Proof string `json:"proof"`
 	// The type of the proof
 	ProofType string `json:"proof_type"`
+	// The schema URL of the claim the proof was created based on
+	SchemaUrl string `json:"schema_url"`
 }

resources/model_proof_create.go

@@ -11,4 +11,6 @@ type ProofCreate struct {
 	Proof string `json:"proof"`
 	// The type of the proof
 	ProofType string `json:"proof_type"`
+	// The schema URL of the claim the proof was created based on
+	SchemaUrl string `json:"schema_url"`
 }