added skip challenge functionality

Author: gianmarcomennecozzi

database/query.go

@@ -26,19 +26,21 @@ var (
 		"created_at timestamp, " +
 		"last_access timestamp, " +
 		"step integer, " +
+		"skipped_challenges text, " +
 		"solved_challenges text);"
 
-	AddTeamQuery = "INSERT INTO team (tag, event_id, email, name, password, created_at, last_access, step, solved_challenges)" +
-		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)"
+	AddTeamQuery = "INSERT INTO team (tag, event_id, email, name, password, created_at, last_access, step, skipped_challenges, solved_challenges)" +
+		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)"
 
 	AddEventQuery = "INSERT INTO event (tag, name, available, capacity, frontends, status, exercises, started_at, finish_expected, finished_at, createdby, onlyvpn)" +
-		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,$11,$12)"
+		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)"
 
 	UpdateCloseEvent  = "UPDATE event SET tag = $2, finished_at = $3 WHERE tag = $1"
 	UpdateEventStatus = "UPDATE event SET status = $2 WHERE tag = $1 "
 
 	UpdateEventLastaccessedDate = "UPDATE team SET last_access = $2 WHERE tag = $1"
 	UpdateTeamSolvedChl         = "UPDATE team SET solved_challenges = $2 WHERE tag = $1"
+	UpdateTeamSkippedChl        = "UPDATE team SET skipped_challenges = $2 WHERE tag = $1"
 	UpdateTeamStep              = "UPDATE team SET step = $2 WHERE tag = $1"
 
 	QuerySolvedChls = "SELECT solved_challenges FROM team WHERE tag=$1"

database/store.go

@@ -46,6 +46,7 @@ type Store interface {
 	GetEventStatus(*pb.GetEventStatusRequest) (int32, error)
 	SetEventStatus(*pb.SetEventStatusRequest) (int32, error)
 	UpdateTeamSolvedChallenge(*pb.UpdateTeamSolvedChallengeRequest) (string, error)
+	UpdateTeamSkippedChallenge(request *pb.UpdateTeamSkippedChallengeRequest) (string, error)
 	UpdateTeamStep(request *pb.UpdateTeamStepTrackerRequest) (string, error)
 	UpdateTeamLastAccess(*pb.UpdateTeamLastAccessRequest) (string, error)
 	UpdateCloseEvent(*pb.UpdateEventRequest) (string, error)
@@ -111,7 +112,7 @@ func (s *store) AddTeam(in *pb.AddTeamRequest) (string, error) {
 		return "", err
 	}
 
-	_, err := s.db.Exec(AddTeamQuery, in.Id, eventId, in.Email, in.Name, in.Password, now, now, 0, "[]")
+	_, err := s.db.Exec(AddTeamQuery, in.Id, eventId, in.Email, in.Name, in.Password, now, now, 0, "[]", "[]")
 	if err != nil {
 		return "", err
 	}
@@ -184,7 +185,7 @@ func (s *store) GetTeams(tag string) ([]model.Team, error) {
 
 		team := new(model.Team)
 		err := rows.Scan(&team.Id, &team.Tag, &team.EventId, &team.Email, &team.Name, &team.Password, &team.CreatedAt,
-			&team.LastAccess, &team.Step, &team.SolvedChallenges)
+			&team.LastAccess, &team.Step, &team.SkippedChallenges, &team.SolvedChallenges)
 		if err != nil && !strings.Contains(err.Error(), handleNullConversionError) {
 			return nil, err
 		}
@@ -244,11 +245,22 @@ func (s *store) UpdateTeamSolvedChallenge(in *pb.UpdateTeamSolvedChallengeReques
 	return OK, nil
 }
 
+func (s *store) UpdateTeamSkippedChallenge(in *pb.UpdateTeamSkippedChallengeRequest) (string, error) {
+	s.m.Lock()
+	defer s.m.Unlock()
+
+	_, err := s.db.Exec(UpdateTeamSkippedChl, in.TeamId, in.SkippedChals)
+	if err != nil {
+		return "", err
+	}
+	return OK, nil
+}
+
 func (s *store) UpdateTeamStep(in *pb.UpdateTeamStepTrackerRequest) (string, error) {
 	s.m.Lock()
 	defer s.m.Unlock()
 
-	_, err := s.db.Exec(UpdateEventLastaccessedDate, in.TeamId, in.Step)
+	_, err := s.db.Exec(UpdateTeamStep, in.TeamId, in.Step)
 	if err != nil {
 		return "", err
 	}

database/timeline_test.go

@@ -49,7 +49,7 @@ func setup() (*sql.DB, error) {
 
 func insertTeamEvent(eid int, db *sql.DB) error {
 
-	_, err := db.Exec(AddTeamQuery, "", eid, "random@email.com", "randomteam", "12345", time.Now(), time.Now(), 0, "[]")
+	_, err := db.Exec(AddTeamQuery, "", eid, "random@email.com", "randomteam", "12345", time.Now(), time.Now(), 0, "[]", "[]")
 	if err != nil {
 		return err
 	}

docker-compose-dev.yml

@@ -25,7 +25,7 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - data:/var/lib/postgresql/data
+      - ${PSQL_DATA_PATH}:/var/lib/postgresql/data
     networks:
       - internal
 

model/model.go

@@ -17,16 +17,17 @@ type Event struct {
 }
 
 type Team struct {
-	Id               uint //DB Primary key
-	Tag              string
-	EventId          uint //DB Primary key of the event
-	Email            string
-	Name             string
-	Password         string
-	CreatedAt        string
-	LastAccess       string
-	SolvedChallenges string
-	Step             uint
+	Id                uint //DB Primary key
+	Tag               string
+	EventId           uint //DB Primary key of the event
+	Email             string
+	Name              string
+	Password          string
+	CreatedAt         string
+	LastAccess        string
+	SolvedChallenges  string
+	Step              uint
+	SkippedChallenges string
 }
 
 type Config struct {