Merge remote-tracking branch 'remotes/origin/main'

takumi-pro · Jan 1, 2024 · d6c2651 · d6c2651
2 parents ab97253 + 1e02c7c
commit d6c2651
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,5 @@ go.work
 .env
 tmp/
 mysql-data
-output
+output
+.idea/
diff --git a/go.mod b/go.mod
@@ -8,13 +8,13 @@ require (
 	github.com/magefile/mage v1.15.0
 	github.com/magiconair/properties v1.8.7
 	github.com/oapi-codegen/runtime v1.1.0
+	gorm.io/driver/mysql v1.5.2
+	gorm.io/gorm v1.25.5
 )
 
 require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	gorm.io/driver/mysql v1.5.2 // indirect
-	gorm.io/gorm v1.25.5 // indirect
 )
 
 require (

diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ type TestResponse struct {
 
 func (s Server) GetApiEvent(ctx echo.Context, params openapi.GetApiEventParams) error {
 	return ctx.JSON(http.StatusOK, TestResponse{
-		Message: "get events",
+		Message: "get events & search",
 	})
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,5 @@ go.work @@
     .env
     tmp/
     mysql-data
-    output
+    output
+    .idea/