Merge pull request #1 from debabky/feature/on-chain-voting

Feature/on chain voting

docs/spec/components/schemas/VotingOption.yaml

@@ -16,7 +16,6 @@ allOf:
             format: int64
           voting_id:
             type: string
-            format: uuid.UUID
           name:
             type: string
           description:

docs/spec/components/schemas/VotingOptionKey.yaml

@@ -5,7 +5,6 @@ required:
 properties:
   id:
     type: string
-    format: uuid.UUID
   type:
     type: string
     enum:

internal/assets/migrations/001_initial.sql

@@ -1,7 +1,7 @@
 -- +migrate Up
 
 create table votings(
-    id           uuid                     primary key default gen_random_uuid(),
+    id           text                     primary key default gen_random_uuid(),
     name         text                        not null,
     description  text                        not null,
     voting_type  integer                     not null,
@@ -12,25 +12,25 @@ create table votings(
 create table voting_options(
     id           integer not null,
     name         text    not null,
-    voting_id    uuid    not null,
+    voting_id    text    not null,
     description  text,
     primary key (id, name, voting_id)
 );
 
 create table verification_requests(
     id        uuid not null primary key,
-    voting_id uuid not null,
+    voting_id text not null,
     nullifier text not null
 );
 
 create table registrations(
-    voting_id uuid not null,
+    voting_id text not null,
     nullifier text not null,
     primary key (voting_id, nullifier)
 );
 
 create table votes(
-    voting_id     uuid not null,
+    voting_id     text not null,
     voting_option text not null,
     nullifier     text not null,
     rank          integer,

internal/data/registrations.go

@@ -1,9 +1,5 @@
 package data
 
-import (
-	"github.com/google/uuid"
-)
-
 type RegistrationsQ interface {
 	New() RegistrationsQ
 	Insert(value Registration) error
@@ -12,6 +8,6 @@ type RegistrationsQ interface {
 }
 
 type Registration struct {
-	VotingID  uuid.UUID `db:"voting_id" structs:"voting_id"`
-	Nullifier string    `db:"nullifier" structs:"nullifier"`
+	VotingID  string `db:"voting_id" structs:"voting_id"`
+	Nullifier string `db:"nullifier" structs:"nullifier"`
 }

internal/data/verification_requests.go

@@ -13,6 +13,6 @@ type VerificationRequestsQ interface {
 
 type VerificationRequest struct {
 	ID        uuid.UUID `db:"id" structs:"id"`
-	VotingID  uuid.UUID `db:"voting_id" structs:"voting_id"`
+	VotingID  string    `db:"voting_id" structs:"voting_id"`
 	Nullifier string    `db:"nullifier" structs:"nullifier"`
 }

internal/data/votes.go

@@ -1,9 +1,5 @@
 package data
 
-import (
-	"github.com/google/uuid"
-)
-
 type VotesQ interface {
 	New() VotesQ
 	Insert(vote Vote) error
@@ -13,8 +9,8 @@ type VotesQ interface {
 }
 
 type Vote struct {
-	VotingID     uuid.UUID `db:"voting_id" structs:"voting_id"`
-	VotingOption string    `db:"voting_option" structs:"voting_option"`
-	Rank         *int64    `db:"rank" structs:"rank"`
-	Nullifier    string    `db:"nullifier" structs:"nullifier"`
+	VotingID     string `db:"voting_id" structs:"voting_id"`
+	VotingOption string `db:"voting_option" structs:"voting_option"`
+	Rank         *int64 `db:"rank" structs:"rank"`
+	Nullifier    string `db:"nullifier" structs:"nullifier"`
 }

internal/data/voting_options.go

@@ -1,18 +1,14 @@
 package data
 
-import (
-	"github.com/google/uuid"
-)
-
 type VotingOptionsQ interface {
 	New() VotingOptionsQ
 	FilterBy(column string, value any) VotingOptionsQ
 	Select() ([]VotingOption, error)
 }
 
 type VotingOption struct {
-	ID          int64     `db:"id" structs:"id"`
-	Name        string    `db:"name" structs:"name"`
-	VotingID    uuid.UUID `db:"voting_id" structs:"voting_id"`
-	Description *string   `db:"description" structs:"description"`
+	ID          int64   `db:"id" structs:"id"`
+	Name        string  `db:"name" structs:"name"`
+	VotingID    string  `db:"voting_id" structs:"voting_id"`
+	Description *string `db:"description" structs:"description"`
 }

internal/data/votings.go

@@ -1,7 +1,6 @@
 package data
 
 import (
-	"github.com/google/uuid"
 	"time"
 )
 
@@ -13,7 +12,7 @@ type VotingsQ interface {
 }
 
 type Voting struct {
-	ID          uuid.UUID  `db:"id" structs:"-"`
+	ID          string     `db:"id" structs:"-"`
 	Name        string     `db:"name" structs:"name"`
 	Description string     `db:"description" structs:"description"`
 	Type        VotingType `db:"voting_type" structs:"voting_type"`

internal/service/api/handlers/ctx.go

@@ -22,7 +22,7 @@ const (
 	tokenClaimsCtxKey
 	cookiesCtxKey
 	networkConfigCtxKey
-	registrationContractCtxKey
+	votingContractCtxKey
 	ethClientCtxKey
 )
 
@@ -86,14 +86,14 @@ func Cookies(r *http.Request) *cookies.Cookies {
 	return r.Context().Value(cookiesCtxKey).(*cookies.Cookies)
 }
 
-func CtxRegistrationContract(contract *contracts.Registration) func(context.Context) context.Context {
+func CtxVotingContract(contract *contracts.Voting) func(context.Context) context.Context {
 	return func(ctx context.Context) context.Context {
-		return context.WithValue(ctx, registrationContractCtxKey, contract)
+		return context.WithValue(ctx, votingContractCtxKey, contract)
 	}
 }
 
-func RegistrationContract(r *http.Request) *contracts.Registration {
-	return r.Context().Value(registrationContractCtxKey).(*contracts.Registration)
+func VotingContract(r *http.Request) *contracts.Voting {
+	return r.Context().Value(votingContractCtxKey).(*contracts.Voting)
 }
 
 func CtxEthClient(client *ethclient.Client) func(context.Context) context.Context {

internal/service/api/handlers/get_auth_data.go

@@ -33,7 +33,7 @@ func GetAuthData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	access, err := JWTIssuer(r).IssueJWT(
-		verificationRequest.VotingID.String(), verificationRequest.Nullifier, jwt.AccessTokenType,
+		verificationRequest.VotingID, verificationRequest.Nullifier, jwt.AccessTokenType,
 	)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to issuer JWT token")
@@ -42,7 +42,7 @@ func GetAuthData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	refresh, err := JWTIssuer(r).IssueJWT(
-		verificationRequest.VotingID.String(), verificationRequest.Nullifier, jwt.RefreshTokenType,
+		verificationRequest.VotingID, verificationRequest.Nullifier, jwt.RefreshTokenType,
 	)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to issuer JWT token")

internal/service/api/handlers/get_voting.go

@@ -36,7 +36,7 @@ func GetVoting(w http.ResponseWriter, r *http.Request) {
 	response := resources.VotingResponse{
 		Data: resources.Voting{
 			Key: resources.Key{
-				ID:   voting.ID.String(),
+				ID:   voting.ID,
 				Type: resources.VOTINGS,
 			},
 			Attributes: resources.VotingAttributes{
@@ -120,6 +120,8 @@ func GetVoting(w http.ResponseWriter, r *http.Request) {
 			})
 		}
 		response.Data.Attributes.Votes = &votesToAdd
+
+		// TODO check on-chain status via nullifier
 	}
 
 	ape.Render(w, response)

internal/service/api/handlers/get_votings.go

@@ -20,7 +20,7 @@ func GetVotings(w http.ResponseWriter, r *http.Request) {
 	for i, voting := range votings {
 		responseData[i] = resources.Voting{
 			Key: resources.Key{
-				ID:   voting.ID.String(),
+				ID:   voting.ID,
 				Type: resources.VOTINGS,
 			},
 			Attributes: resources.VotingAttributes{