refactor(subscr): move to pro dir

Author: fiftin

api/router.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"embed"
 	"fmt"
-	"github.com/semaphoreui/semaphore/services/interfaces"
+	"github.com/semaphoreui/semaphore/pro_interfaces"
 	"net/http"
 	"os"
 	"path"
@@ -18,7 +18,6 @@ import (
 
 	"github.com/semaphoreui/semaphore/api/debug"
 	"github.com/semaphoreui/semaphore/pkg/tz"
-	proSubscriptions "github.com/semaphoreui/semaphore/pro/api/subscriptions"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/semaphoreui/semaphore/api/runners"
@@ -92,7 +91,7 @@ func Route(
 	secretStorageService server.SecretStorageService,
 	accessKeyService server.AccessKeyService,
 	environmentService server.EnvironmentService,
-	subscriptionService interfaces.SubscriptionService,
+	subscriptionService pro_interfaces.SubscriptionService,
 ) *mux.Router {
 
 	projectController := &projects.ProjectController{ProjectService: projectService}
@@ -106,6 +105,7 @@ func Route(
 	terraformController := proApi.NewTerraformController(encryptionService, terraformStore)
 	userController := NewUserController(subscriptionService)
 	usersController := NewUsersController(subscriptionService)
+	subscriptionController := proApi.NewSubscriptionController()
 
 	r := mux.NewRouter()
 	r.NotFoundHandler = http.HandlerFunc(servePublic)
@@ -177,8 +177,8 @@ func Route(
 
 	authenticatedAPI.Path("/info").HandlerFunc(getSystemInfo).Methods("GET", "HEAD")
 
-	authenticatedAPI.Path("/subscription").HandlerFunc(proSubscriptions.Activate).Methods("POST")
-	authenticatedAPI.Path("/subscription").HandlerFunc(proSubscriptions.GetSubscription).Methods("GET")
+	authenticatedAPI.Path("/subscription").HandlerFunc(subscriptionController.Activate).Methods("POST")
+	authenticatedAPI.Path("/subscription").HandlerFunc(subscriptionController.GetSubscription).Methods("GET")
 
 	authenticatedAPI.Path("/projects").HandlerFunc(projects.GetProjects).Methods("GET", "HEAD")
 	authenticatedAPI.Path("/projects").HandlerFunc(projectsController.AddProject).Methods("POST")

api/user.go

@@ -6,18 +6,18 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
-	"github.com/semaphoreui/semaphore/services/interfaces"
+	"github.com/semaphoreui/semaphore/pro_interfaces"
 	"github.com/semaphoreui/semaphore/util"
 	"io"
 	"net/http"
 	"strings"
 )
 
 type UserController struct {
-	subscriptionService interfaces.SubscriptionService
+	subscriptionService pro_interfaces.SubscriptionService
 }
 
-func NewUserController(subscriptionService interfaces.SubscriptionService) *UserController {
+func NewUserController(subscriptionService pro_interfaces.SubscriptionService) *UserController {
 	return &UserController{
 		subscriptionService: subscriptionService,
 	}

api/users.go

@@ -7,7 +7,7 @@ import (
 	"github.com/pquerna/otp/totp"
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
-	"github.com/semaphoreui/semaphore/services/interfaces"
+	"github.com/semaphoreui/semaphore/pro_interfaces"
 	log "github.com/sirupsen/logrus"
 	"image/png"
 	"net/http"
@@ -16,10 +16,10 @@ import (
 )
 
 type UsersController struct {
-	subscriptionService interfaces.SubscriptionService
+	subscriptionService pro_interfaces.SubscriptionService
 }
 
-func NewUsersController(subscriptionService interfaces.SubscriptionService) *UsersController {
+func NewUsersController(subscriptionService pro_interfaces.SubscriptionService) *UsersController {
 	return &UsersController{
 		subscriptionService: subscriptionService,
 	}

pro/api/subscriptions.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"github.com/semaphoreui/semaphore/pro_interfaces"
+	"net/http"
+)
+
+func NewSubscriptionController() pro_interfaces.SubscriptionController {
+	return &subscriptionControllerImpl{}
+}
+
+type subscriptionControllerImpl struct {
+}
+
+func (ctrl *subscriptionControllerImpl) Activate(w http.ResponseWriter, r *http.Request) {}
+
+func (ctrl *subscriptionControllerImpl) GetSubscription(w http.ResponseWriter, r *http.Request) {}

pro/api/subscriptions/subscriptions.go

@@ -1,11 +1,12 @@
 package server
 
 import (
-	"github.com/semaphoreui/semaphore/services/interfaces"
+	"github.com/semaphoreui/semaphore/db"
+	"github.com/semaphoreui/semaphore/pro_interfaces"
 )
 
-func NewSubscriptionService() interfaces.SubscriptionService {
-	return nil
+func NewSubscriptionService(userRepo db.UserManager, optionsRepo db.OptionsManager) pro_interfaces.SubscriptionService {
+	return &SubscriptionServiceImpl{}
 }
 
 type SubscriptionServiceImpl struct {
@@ -18,3 +19,7 @@ func (s *SubscriptionServiceImpl) HasActiveSubscription() bool {
 func (s *SubscriptionServiceImpl) CanAddProUser() (ok bool, err error) {
 	return false, nil
 }
+
+func (s *SubscriptionServiceImpl) StartValidationCron() {
+
+}

pro/services/server/subscription_svc.go

@@ -0,0 +1,8 @@
+package pro_interfaces
+
+import "net/http"
+
+type SubscriptionController interface {
+	GetSubscription(w http.ResponseWriter, r *http.Request)
+	Activate(w http.ResponseWriter, r *http.Request)
+}

pro_interfaces/subscription_ctl.go

@@ -1,6 +1,7 @@
-package interfaces
+package pro_interfaces
 
 type SubscriptionService interface {
 	HasActiveSubscription() bool
 	CanAddProUser() (ok bool, err error)
+	StartValidationCron()
 }