wip: remove container model

internal/casbin/policy.go

@@ -23,7 +23,7 @@ func initDefaultPolicy() {
 		{"user", "/api/teams/{id}/users/{user_id}", "DELETE"},
 		{"user", "/api/teams/{id}/join", "POST"},
 		{"user", "/api/teams/{id}/leave", "DELETE"},
-		{"user", "/api/challenges/", "GET"},
+		{"user", "/api/challenges/*", "GET"},
 		{"user", "/api/categories/", "GET"},
 		{"user", "/api/games/", "GET"},
 		{"user", "/api/games/{id}", "GET"},

internal/container/manager/docker.go

@@ -26,7 +26,7 @@ type DockerManager struct {
 	PodID      uint
 	RespID     []string
 	Proxy      proxy.IPodProxy
-	Container  *model.Container
+	Nats       []*model.Nat
 	CancelCtx  context.Context
 	CancelFunc context.CancelFunc
 }
@@ -47,7 +47,7 @@ func (c *DockerManager) Duration() (duration time.Duration) {
 	return c.duration
 }
 
-func (c *DockerManager) Setup() (container *model.Container, err error) {
+func (c *DockerManager) Setup() (nats []*model.Nat, err error) {
 
 	c.CancelCtx, c.CancelFunc = context.WithCancel(context.Background())
 
@@ -115,7 +115,7 @@ func (c *DockerManager) Setup() (container *model.Container, err error) {
 		c.RespID[len(c.RespID)-1],
 	)
 
-	nats := make([]*model.Nat, 0)
+	nats = make([]*model.Nat, 0)
 
 	switch config.AppCfg().Container.Proxy.Enabled {
 	case true:
@@ -155,14 +155,9 @@ func (c *DockerManager) Setup() (container *model.Container, err error) {
 		}
 	}
 
-	container = &model.Container{
-		ChallengeID: c.challenge.ID,
-		Nats:        nats,
-	}
-
-	c.Container = container
+	c.Nats = nats
 
-	return container, err
+	return nats, err
 }
 
 func (c *DockerManager) Status() (status string, err error) {

internal/container/manager/manager.go

@@ -6,7 +6,7 @@ import (
 )
 
 type IContainerManager interface {
-	Setup() (container *model.Container, err error)
+	Setup() (nats []*model.Nat, err error)
 	Status() (status string, err error)
 	Duration() (duration time.Duration)
 	Remove()

internal/controller/pod.go

@@ -59,7 +59,7 @@ func (c *PodController) Create(ctx *gin.Context) {
 	ctx.JSON(http.StatusOK, gin.H{
 		"code":       http.StatusOK,
 		"id":         pod.ID,
-		"container":  pod.Container,
+		"nats":       pod.Nats,
 		"removed_at": pod.RemovedAt,
 	})
 }

internal/database/database.go

@@ -78,7 +78,6 @@ func syncDatabase() {
 		&model.Submission{},
 		&model.Nat{},
 		&model.Hint{},
-		&model.Container{},
 		&model.Pod{},
 		&model.Game{},
 		&model.GameChallenge{},

internal/model/nat.go

@@ -1,12 +1,11 @@
 package model
 
-// Nat is a model used to reveal the relationship between JeopardyImage ports and Container network port forwarding.
 type Nat struct {
-	ID          uint       `json:"id"`
-	ContainerID uint       `gorm:"not null" json:"container_id"`
-	Container   *Container `json:"container,omitempty"`
-	SrcPort     int        `gorm:"not null" json:"src_port"` // Of Image
-	DstPort     int        `gorm:"not null" json:"dst_port"` // Of Container
-	Proxy       string     `json:"proxy"`                    // Of Platform
-	Entry       string     `gorm:"type:varchar(128)" json:"entry"`
+	ID      uint   `json:"id"`
+	PodID   uint   `gorm:"not null" json:"pod_id"`
+	Pod     *Pod   `json:"pod,omitempty"`
+	SrcPort int    `gorm:"not null" json:"src_port"` // Of Image
+	DstPort int    `gorm:"not null" json:"dst_port"` // Of Pod
+	Proxy   string `json:"proxy"`                    // Of Platform
+	Entry   string `gorm:"type:varchar(128)" json:"entry"`
 }

internal/model/pod.go

@@ -1,6 +1,5 @@
 package model
 
-// Pod is the minimum unit of Container operation.
 type Pod struct {
 	ID          uint       `json:"id"`
 	GameID      uint       `json:"game_id"`
@@ -11,7 +10,6 @@ type Pod struct {
 	Team        *Team      `json:"team,omitempty"`
 	ChallengeID uint       `json:"challenge_id"`
 	Challenge   *Challenge `json:"challenge,omitempty"`
-	ContainerID uint       `json:"container_id"`
-	Container   *Container `json:"container,omitempty"`
 	RemovedAt   int64      `json:"removed_at"`
+	Nats        []*Nat     `json:"nats,omitempty"`
 }

internal/model/response/pod_response.go

@@ -6,15 +6,16 @@ import (
 
 type PodStatusResponse struct {
 	ID        uint             `json:"id"`
-	Container *model.Container `json:"container"`
+	Challenge *model.Challenge `json:"challenge"`
+	Nats      []*model.Nat     `json:"nats"`
 	RemovedAt int64            `json:"removed_at"`
 	Status    string           `json:"status"`
 }
 
 type PodResponse struct {
-	ID          uint             `json:"id"`
-	ChallengeID uint             `json:"challenge_id"`
-	Container   *model.Container `json:"container"`
-	RemovedAt   int64            `json:"removed_at"`
-	Status      string           `json:"status"`
+	ID        uint             `json:"id"`
+	Challenge *model.Challenge `json:"challenge"`
+	Nats      []*model.Nat     `json:"nats"`
+	RemovedAt int64            `json:"removed_at"`
+	Status    string           `json:"status"`
 }

internal/repository/pod.go

@@ -67,16 +67,13 @@ func (t *PodRepository) Find(req request.PodFindRequest) (pods []model.Pod, coun
 	}
 
 	result = db.
-		Preload("Container", func(db *gorm.DB) *gorm.DB {
+		Preload("Challenge", func(db *gorm.DB) *gorm.DB {
 			return db.
-				Preload("Challenge", func(db *gorm.DB) *gorm.DB {
-					return db.
-						Preload("Ports").
-						Preload("Envs").
-						Select([]string{"id", "title"})
-				}).
-				Preload("Nats")
+				Preload("Ports").
+				Preload("Envs").
+				Select([]string{"id", "title"})
 		}).
+		Preload("Nats").
 		Find(&pods)
 	return pods, count, result.Error
 }

internal/repository/repository.go

@@ -24,7 +24,6 @@ type Repository struct {
 	FlagRepository          IFlagRepository
 	PortRepository          IPortRepository
 	NatRepository           INatRepository
-	ContainerRepository     IContainerRepository
 	EnvRepository           IEnvRepository
 	FlagGenRepository       IFlagGenRepository
 	GameTeamRepository      IGameTeamRepository
@@ -53,7 +52,6 @@ func InitRepository() {
 			FlagRepository:          NewFlagRepository(db),
 			PortRepository:          NewPortRepository(db),
 			NatRepository:           NewNatRepository(db),
-			ContainerRepository:     NewContainerRepository(db),
 			EnvRepository:           NewEnvRepository(db),
 			FlagGenRepository:       NewFlagGenRepository(db),
 			GameTeamRepository:      NewGameTeamRepository(db),

internal/service/pod.go

@@ -54,13 +54,11 @@ type PodService struct {
 	podRepository       repository.IPodRepository
 	natRepository       repository.INatRepository
 	flagGenRepository   repository.IFlagGenRepository
-	instanceRepository  repository.IContainerRepository
 }
 
 func NewPodService(appRepository *repository.Repository) IPodService {
 	return &PodService{
 		challengeRepository: appRepository.ChallengeRepository,
-		instanceRepository:  appRepository.ContainerRepository,
 		flagGenRepository:   appRepository.FlagGenRepository,
 		podRepository:       appRepository.PodRepository,
 		natRepository:       appRepository.NatRepository,
@@ -150,7 +148,7 @@ func (t *PodService) Create(req request.PodCreateRequest) (res response.PodStatu
 		time.Duration(challenge.Duration)*time.Second,
 	)
 
-	container, err := ctnManager.Setup()
+	nats, err := ctnManager.Setup()
 
 	var gameID uint
 	if req.GameID != nil {
@@ -169,7 +167,7 @@ func (t *PodService) Create(req request.PodCreateRequest) (res response.PodStatu
 		GameID:      gameID,
 		TeamID:      teamID,
 		RemovedAt:   removedAt,
-		Container:   container,
+		Nats:        nats,
 	})
 
 	ctnManager.SetPodID(pod.ID)
@@ -189,7 +187,7 @@ func (t *PodService) Create(req request.PodCreateRequest) (res response.PodStatu
 
 	return response.PodStatusResponse{
 		ID:        pod.ID,
-		Container: pod.Container,
+		Nats:      nats,
 		RemovedAt: removedAt,
 	}, err
 }
@@ -248,15 +246,15 @@ func (t *PodService) Remove(req request.PodRemoveRequest) (err error) {
 }
 
 func (t *PodService) FindById(id uint) (rep response.PodResponse, err error) {
-	instance, _ := t.podRepository.FindById(id)
+	pod, _ := t.podRepository.FindById(id)
 	if PodManagers[id] != nil {
 		ctn := PodManagers[id]
 		status, _ := ctn.Status()
 		rep = response.PodResponse{
-			ID:          id,
-			RemovedAt:   instance.RemovedAt,
-			ChallengeID: instance.ChallengeID,
-			Status:      status,
+			ID:        id,
+			RemovedAt: pod.RemovedAt,
+			Challenge: pod.Challenge,
+			Status:    status,
 		}
 		return rep, nil
 	}
@@ -278,11 +276,11 @@ func (t *PodService) Find(req request.PodFindRequest) (pods []response.PodRespon
 			}
 		}
 		pods = append(pods, response.PodResponse{
-			ID:          pod.ID,
-			RemovedAt:   pod.RemovedAt,
-			Container:   pod.Container,
-			ChallengeID: pod.ChallengeID,
-			Status:      status,
+			ID:        pod.ID,
+			RemovedAt: pod.RemovedAt,
+			Nats:      pod.Nats,
+			Challenge: pod.Challenge,
+			Status:    status,
 		})
 	}
 	return pods, err