naudachu
/
ticket-pimp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- new YT entity to support multiaccounting;

This commit is contained in:
naudachu 2023-07-26 14:17:34 +05:00
parent 864c583e3c
commit 15cf91aeef
6 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bot/controller/controller.go
View File

@ -7,10 +7,11 @@ import (
) )
type WorkflowController struct { type WorkflowController struct {
iGit ext.IGit iGit ext.IGit
iCloud ext.ICloud iCloud ext.ICloud
iYouTrack ext.IYouTrack iYouTrack ext.IYouTrack
iCoda ext.ICoda additionalYT ext.IYouTrack
iCoda ext.ICoda
} }
func NewWorkflowController( func NewWorkflowController(
@ -20,13 +21,16 @@ func NewWorkflowController(
cloudAuthUser, cloudAuthUser,
cloudAuthPass, cloudAuthPass,
ytBaseURL, ytBaseURL,
ytToken string, ytToken,
addYTURL,
addYTToken string,
) *WorkflowController { ) *WorkflowController {
return &WorkflowController{ return &WorkflowController{
iGit: ext.NewGit(gitBaseURL, gitToken), iGit: ext.NewGit(gitBaseURL, gitToken),
iCloud: ext.NewCloud(cloudBaseURL, cloudAuthUser, cloudAuthPass), iCloud: ext.NewCloud(cloudBaseURL, cloudAuthUser, cloudAuthPass),
iYouTrack: ext.NewYT(ytBaseURL, ytToken), iYouTrack: ext.NewYT(ytBaseURL, ytToken),
iCoda: ext.NewCodaClient(), additionalYT: ext.NewYT(addYTURL, addYTToken),
iCoda: ext.NewCodaClient(),
} }
} }

6
bot/controller/task.go
View File

@ -23,9 +23,9 @@ func (wc *WorkflowController) NewTask(summ, desc, c, cLink string) *Task {
func (wc *WorkflowController) CreateTask(t *Task) (*Task, error) { func (wc *WorkflowController) CreateTask(t *Task) (*Task, error) {
yt := wc.iYouTrack yt := wc.additionalYT
projectID, err := yt.GetProjectIDByName("ETMD") projectID, err := yt.GetProjectIDByName("E")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -38,7 +38,7 @@ func (wc *WorkflowController) CreateTask(t *Task) (*Task, error) {
} }
t.Key = issue.Key t.Key = issue.Key
t.URL = fmt.Sprintf("https://marlerino.youtrack.cloud/issue/%s", issue.Key) t.URL = fmt.Sprintf("https://mobmarlerino.youtrack.cloud/issue/%s", issue.Key)
return t, nil return t, nil
} }

7
bot/handler/handler.go
View File

@ -17,7 +17,7 @@ type Handler struct {
workflow controller.IWorkflowController workflow controller.IWorkflowController
} }
func NewHandler(gitBaseURL, gitToken, cloudBaseURL, cloudAuthUser, cloudAuthPass, ytBaseURL, ytToken string) *Handler { func NewHandler(gitBaseURL, gitToken, cloudBaseURL, cloudAuthUser, cloudAuthPass, ytBaseURL, ytToken, addYTURL, addYTToken string) *Handler {
return &Handler{ return &Handler{
workflow: controller.NewWorkflowController( workflow: controller.NewWorkflowController(
gitBaseURL, gitBaseURL,
@ -26,7 +26,10 @@ func NewHandler(gitBaseURL, gitToken, cloudBaseURL, cloudAuthUser, cloudAuthPass
cloudAuthUser, cloudAuthUser,
cloudAuthPass, cloudAuthPass,
ytBaseURL, ytBaseURL,
ytToken), ytToken,
addYTURL,
addYTToken,
),
} }
} }

4
cmd/main.go
View File

@ -16,7 +16,7 @@ import (
func main() { func main() {
log.Print("started") log.Print("started")
env(".dev.env") env(".env")
ctx := context.Background() ctx := context.Background()
ctx, cancel := signal.NotifyContext(ctx, os.Interrupt, os.Kill, syscall.SIGTERM) ctx, cancel := signal.NotifyContext(ctx, os.Interrupt, os.Kill, syscall.SIGTERM)
@ -54,6 +54,8 @@ func runBot(ctx context.Context) error {
os.Getenv("CLOUD_PASS"), os.Getenv("CLOUD_PASS"),
os.Getenv("YT_URL"), os.Getenv("YT_URL"),
os.Getenv("YT_TOKEN"), os.Getenv("YT_TOKEN"),
os.Getenv("YT_ADDITIONAL_URL"),
os.Getenv("YT_ADDITIONAL_TOKEN"),
) )
router := tgb.NewRouter(). router := tgb.NewRouter().

7
internal/domain/telegram.go Normal file
View File

@ -0,0 +1,7 @@
package domain
type TgUser struct {
ID string
Name string
TgLink string
}

7
internal/storage/tasks.go Normal file
View File

@ -0,0 +1,7 @@
package storage
import "ticket-pimp/internal/domain"
type TaskRepository interface {
GetOrCreate(tg string) *domain.TgUser
}