Release v0.1.0

.github/workflows/build-check.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
 
       - name: "Docker: Build Image for Checking"
         id: ghcr-docker

.github/workflows/build-release.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
 
       - name: "Metadata: Git"
         id: git-meta

.github/workflows/pr-auto-create.yml

@@ -15,7 +15,7 @@ jobs:
     name: Create PR
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
         with:
           ref: "dev"
 

.github/workflows/release-dispatcher.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.event.pull_request.merged && github.event.pull_request.base.ref == 'main' && startsWith(github.event.pull_request.title, 'Release')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
         with:
           ref: "main"
 

.gitignore

@@ -143,4 +143,6 @@ debug/
 **/logs/
 
 .env
-__debug_bin
+__debug_bin*
+
+node_modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.0-alpine AS base
+FROM golang:1.21.1-alpine AS base
 WORKDIR /app
 
 # builder

cmd/app/cli/script/command.go

@@ -1,55 +1,21 @@
 package script
 
 import (
-	"log"
+	"github.com/urfave/cli/v2"
 
 	"exusiai.dev/roguestats-backend/cmd/app/cli/script/syncschema"
-	"github.com/urfave/cli/v2"
+	"exusiai.dev/roguestats-backend/cmd/app/cli/script/tempcsvimport"
+	"exusiai.dev/roguestats-backend/cmd/app/cli/script/userimport"
 )
 
 func Command() *cli.Command {
 	return &cli.Command{
 		Name:  "script",
 		Usage: "run scripts",
 		Subcommands: []*cli.Command{
-			{
-				Name:  "import",
-				Usage: "import data from temp csv",
-				Action: func(c *cli.Context) error {
-					importType := c.Args().Get(0)
-					path := c.Args().Get(1)
-					if path == "" {
-						return cli.Exit("Please provide path to csv file", 1)
-					}
-					log.Default().Printf("importing %s data from '%s'\n", importType, path)
-					if importType == "battle" {
-						err := NewBattleCSVImport(path).Run()
-						if err != nil {
-							return err
-						}
-					} else if importType == "incident" {
-						err := NewIncidentCSVImport(path).Run()
-						if err != nil {
-							return err
-						}
-					} else if importType == "rest" {
-						err := NewRestCSVImport(path).Run()
-						if err != nil {
-							return err
-						}
-					} else if importType == "portal" {
-						err := NewPortalCSVImport(path).Run()
-						if err != nil {
-							return err
-						}
-					} else {
-						return cli.Exit("Unknown import type", 1)
-					}
-					log.Default().Printf("finished importing %s data from '%s'\n", importType, path)
-					return nil
-				},
-			},
+			tempcsvimport.Command(),
 			syncschema.Command(),
+			userimport.Command(),
 		},
 	}
 }

cmd/app/cli/script/syncschema/command.go

@@ -1,8 +1,9 @@
 package syncschema
 
 import (
-	appcli "exusiai.dev/roguestats-backend/cmd/app/cli"
 	"github.com/urfave/cli/v2"
+
+	appcli "exusiai.dev/roguestats-backend/cmd/app/cli"
 )
 
 func Command() *cli.Command {
@@ -14,7 +15,7 @@ func Command() *cli.Command {
 				Name:    "dir",
 				Aliases: []string{"d"},
 				Usage:   "Directory containing the JSON Schemas.",
-				Value:   "./schema",
+				Value:   "./schema/researches",
 			},
 		},
 		Action: func(c *cli.Context) error {

cmd/app/cli/script/syncschema/syncschema.go

@@ -6,11 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"exusiai.dev/roguestats-backend/internal/ent"
-	"exusiai.dev/roguestats-backend/internal/ent/research"
 	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 	"go.uber.org/fx"
+
+	"exusiai.dev/roguestats-backend/internal/ent"
+	"exusiai.dev/roguestats-backend/internal/ent/research"
 )
 
 type SyncSchemaCommandDeps struct {
@@ -41,6 +42,11 @@ func Run(c *cli.Context, d SyncSchemaCommandDeps) error {
 		name := segments[1]
 		log.Info().Str("path", path).Str("id", id).Msg("processing research")
 
+		jsonBytes, err := minifiedJsonFile(path)
+		if err != nil {
+			return err
+		}
+
 		// Check if the research exists.
 		research, err := tx.Research.Query().Where(research.ID(id)).Only(c.Context)
 		if err != nil {
@@ -50,6 +56,7 @@ func Run(c *cli.Context, d SyncSchemaCommandDeps) error {
 				research, err = tx.Research.Create().
 					SetID(id).
 					SetName(name).
+					SetSchema(jsonBytes).
 					Save(c.Context)
 				if err != nil {
 					return err
@@ -59,14 +66,10 @@ func Run(c *cli.Context, d SyncSchemaCommandDeps) error {
 			}
 		}
 
-		jsonBytes, err := minifiedJsonFile(path)
-		if err != nil {
-			return err
-		}
-
 		// Update the research schema.
 		log.Info().Str("id", id).Msg("updating research schema")
 		_, err = research.Update().
+			SetName(name).
 			SetSchema(jsonBytes).
 			Save(c.Context)
 		if err != nil {

cmd/app/cli/script/battle_csv_import.go → cmd/app/cli/script/tempcsvimport/battle_csv_import.go

@@ -1,4 +1,4 @@
-package script
+package tempcsvimport
 
 import (
 	"log"
@@ -21,9 +21,10 @@ func (c *BattleCSVImport) Run() error {
 	for _, row := range records {
 		log.Default().Printf("importing row '%s'\n", row)
 		content := c.convertRowToContent(row)
+		userID := c.getUserID(row)
 		log.Println(content)
-		if len(content) > 0 {
-			PostEvent(content, "battle")
+		if len(content) > 0 && userID != "" {
+			PostEvent(content, "rsc_01h8yfh5y5vff7sss16ra735rc", userID)
 		}
 	}
 	return nil
@@ -95,3 +96,7 @@ func (c *BattleCSVImport) convertRowToContent(row []string) map[string]any {
 
 	return content
 }
+
+func (c *BattleCSVImport) getUserID(row []string) string {
+	return GetColumnHandler().HandleUser(strings.TrimSpace(row[14]))
+}

cmd/app/cli/script/column_handler.go → cmd/app/cli/script/tempcsvimport/column_handler.go

@@ -1,4 +1,4 @@
-package script
+package tempcsvimport
 
 import (
 	"strconv"
@@ -16,6 +16,7 @@ type ColumnHandler struct {
 	incidentTypeMap  map[string]string
 	variationMap     map[string]string
 	layoutMap        map[string]string
+	userMap          map[string]string
 }
 
 var (
@@ -33,6 +34,7 @@ func GetColumnHandler() *ColumnHandler {
 			incidentTypeMap:  initIncidentTypeMap(),
 			variationMap:     initVariaionMap(),
 			layoutMap:        initLayoutMap(),
+			userMap:          initUserMap(),
 		}
 	})
 	return columnHandlerInstance
@@ -76,9 +78,15 @@ func (c ColumnHandler) HandleRecruitTickets(input1 string, input2 string) [][]st
 	if input1 == "" {
 		return nil
 	}
-	tickets := make([][]string, 2)
-	tickets[0] = c.handleRecruitTicketsHelper(input1)
-	tickets[1] = c.handleRecruitTicketsHelper(input2)
+	tickets := make([][]string, 0)
+	oneTickets := c.handleRecruitTicketsHelper(input1)
+	if len(oneTickets) > 0 {
+		tickets = append(tickets, oneTickets)
+	}
+	oneTickets = c.handleRecruitTicketsHelper(input2)
+	if len(oneTickets) > 0 {
+		tickets = append(tickets, oneTickets)
+	}
 	return tickets
 }
 
@@ -160,6 +168,14 @@ func (c ColumnHandler) HandleLayout(input string) string {
 	return val
 }
 
+func (c ColumnHandler) HandleUser(input string) string {
+	val, ok := c.userMap[input]
+	if !ok {
+		return ""
+	}
+	return val
+}
+
 func initBandMap() map[string]string {
 	return map[string]string{
 		"指挥":     "rogue_3_band_1",
@@ -328,3 +344,21 @@ func initLayoutMap() map[string]string {
 		"混合e：3-1":            "mixed_3-1",
 	}
 }
+
+func initUserMap() map[string]string {
+	return map[string]string{
+		"红白":   "usr_01h8ygnyfd4fkx4sy9n4gpvy3b",
+		"斩喵":   "usr_01h8zjxfjr07h1wqg2vb41k4mn",
+		"天离":   "usr_01h8zjxppevh1hzrbmdjc1hfmz",
+		"麻薯":   "usr_01h8zjxzt4mkgx8ah0qnb13x91",
+		"锅":    "usr_01h8zjy2s1vg1xt8esv6b4qe7k",
+		"孔明亲":  "usr_01h8zjxr8r34d0hdk6deyt8xz7",
+		"黒沢":   "usr_01h8zjxn3p5qc9zeevptc8tm8c",
+		"里雪":   "usr_01h8zjxhtzg4a5nxh1tfwrde72",
+		"fl":   "usr_01h8zjxsqzxwysrbpqnaxv7g5q",
+		"一抹晚烟": "usr_01haeckmx4a73g86a87ma8x507",
+		"月咏千空": "usr_01haecnyjxxta7b5p4r8c9e271",
+		"大世落幕": "usr_01haecp3rzvwsg2hpg3v09n4wb",
+		"莫邪":   "usr_01haecp914w7ea81h27htkg6pc",
+	}
+}

cmd/app/cli/script/tempcsvimport/command.go

@@ -0,0 +1,47 @@
+package tempcsvimport
+
+import (
+	"log"
+
+	"github.com/urfave/cli/v2"
+)
+
+func Command() *cli.Command {
+	return &cli.Command{
+		Name:  "import",
+		Usage: "import data from temp csv",
+		Action: func(c *cli.Context) error {
+			importType := c.Args().Get(0)
+			path := c.Args().Get(1)
+			if path == "" {
+				return cli.Exit("Please provide path to csv file", 1)
+			}
+			log.Default().Printf("importing %s data from '%s'\n", importType, path)
+			if importType == "battle" {
+				err := NewBattleCSVImport(path).Run()
+				if err != nil {
+					return err
+				}
+			} else if importType == "incident" {
+				err := NewIncidentCSVImport(path).Run()
+				if err != nil {
+					return err
+				}
+			} else if importType == "rest" {
+				err := NewRestCSVImport(path).Run()
+				if err != nil {
+					return err
+				}
+			} else if importType == "portal" {
+				err := NewPortalCSVImport(path).Run()
+				if err != nil {
+					return err
+				}
+			} else {
+				return cli.Exit("Unknown import type", 1)
+			}
+			log.Default().Printf("finished importing %s data from '%s'\n", importType, path)
+			return nil
+		},
+	}
+}

cmd/app/cli/script/import_util.go → cmd/app/cli/script/tempcsvimport/import_util.go

@@ -1,13 +1,14 @@
-package script
+package tempcsvimport
 
 import (
 	"context"
 	"encoding/csv"
 	"log"
 	"os"
 
-	"exusiai.dev/roguestats-backend/internal/model"
 	"github.com/machinebox/graphql"
+
+	"exusiai.dev/roguestats-backend/internal/model"
 )
 
 func ReadCSVFile(filePath string) [][]string {
@@ -24,7 +25,7 @@ func ReadCSVFile(filePath string) [][]string {
 	return records
 }
 
-func PostEvent(content map[string]any, researchID string) {
+func PostEvent(content map[string]any, researchID string, userID string) {
 	client := graphql.NewClient("http://localhost:3500/graphql")
 	req := graphql.NewRequest(`
 	mutation CreateEvent($input: CreateEventInput!) {
@@ -38,13 +39,14 @@ func PostEvent(content map[string]any, researchID string) {
 		Content:    content,
 		ResearchID: researchID,
 		UserAgent:  userAgent,
+		UserID:     userID,
 	}
 	req.Var("input", input)
 	req.Header.Set("Authorization", "Bearer <token>")
 	ctx := context.Background()
 	var respData any
 	if err := client.Run(ctx, req, &respData); err != nil {
-		log.Fatal(err)
+		log.Default().Println(err)
 	}
 	log.Println(respData)
 }