chore: change module name (#23)

android-project-46group · May 3, 2022 · 2fa133a · 2fa133a
1 parent 3f0e890
commit 2fa133a
Show file tree

Hide file tree

Showing 28 changed files with 456 additions and 183 deletions.
diff --git a/api/blogs.go b/api/blogs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 /*

diff --git a/api/formations.go b/api/formations.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 func GetAllFormations(w http.ResponseWriter, r *http.Request) {

diff --git a/api/members.go b/api/members.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 /*

diff --git a/api/positions.go b/api/positions.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 /*

diff --git a/api/songs.go b/api/songs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 func GetAllSongs(w http.ResponseWriter, r *http.Request) {

diff --git a/api/validations.go b/api/validations.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"web/db"
+	"github.com/android-project-46group/api-server/db"
 )
 
 func IsApiKeyValid(key string) bool {

diff --git a/night_batch.go → batch/night_batch.go b/night_batch.go → batch/night_batch.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"web/db/data"
+	"github.com/android-project-46group/api-server/db/data"
 )
 
 func main() {

diff --git a/db/apikeys.go b/db/apikeys.go
@@ -5,11 +5,10 @@ import (
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 )
 
-
-func InsertApiKey(key string) (error) {
+func InsertApiKey(key string) error {
 
 	s := &models.APIKey{KeyVal: key}
 

diff --git a/db/blogs.go b/db/blogs.go
@@ -4,7 +4,7 @@ import (
 	_ "github.com/lib/pq"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 )
 
 type MemberBlogBind struct {

diff --git a/db/data/find_utils.go b/db/data/find_utils.go
@@ -3,7 +3,7 @@ package data
 import (
 	"fmt"
 
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 )

diff --git a/db/data/insert_blog.go b/db/data/insert_blog.go
@@ -3,7 +3,7 @@ package data
 import (
 	"fmt"
 
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 )

diff --git a/db/data/insert_formation.go b/db/data/insert_formation.go
@@ -2,8 +2,8 @@ package data
 
 import (
 	"fmt"
-	
-	models "web/db/my_models"
+
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 )
@@ -13,7 +13,7 @@ func InsertFormations() {
 	for _, formation := range formations {
 		numArrays := MakeFormations(formation.Position)
 
-		m := &models.Formation{ }
+		m := &models.Formation{}
 		m.FirstRowNum.Int16 = int16(numArrays[0])
 		m.FirstRowNum.Valid = true
 		m.SecondRowNum.Int16 = int16(numArrays[1])
@@ -46,5 +46,5 @@ func MakeFormations(positions []Position) []int {
 			firstRowNum += 1
 		}
 	}
-	return []int {firstRowNum, secondRowNum, thirdRowNum}
+	return []int{firstRowNum, secondRowNum, thirdRowNum}
 }
diff --git a/db/data/insert_group.go b/db/data/insert_group.go
@@ -2,15 +2,15 @@ package data
 
 import (
 	"fmt"
-	
-	models "web/db/my_models"
+
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 )
 
 func InsertGroups() {
-	groups := [] string{"nogizaka", "sakurazaka", "hinatazaka"}
+	groups := []string{"nogizaka", "sakurazaka", "hinatazaka"}
 	for _, group := range groups {
 		fmt.Println(group)
 		m := &models.Group{GroupName: group}

diff --git a/db/data/insert_member.go b/db/data/insert_member.go
@@ -7,7 +7,7 @@ import (
 
 	_ "github.com/lib/pq"
 	// "./db/data"
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	// "github.com/volatiletech/sqlboiler/v4/queries/qm"

diff --git a/db/data/insert_member_info.go b/db/data/insert_member_info.go
@@ -1,16 +1,15 @@
 package data
 
 import (
-    "fmt"
+	"fmt"
 
+	models "github.com/android-project-46group/api-server/db/my_models"
 	_ "github.com/lib/pq"
-	models "web/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 )
 
-
 func FindUserByName(name string) (*models.Member, error) {
 	member, err := models.Members(qm.Select("*"), qm.Where("name_ja=?", name)).One(Ctx, DB)
 
@@ -35,19 +34,19 @@ func InsertMemberInfosSakura() {
 func InsertMemberInfosFromGroupName(group string) {
 	infos := LoadMemberInfoFile(group)
 	// groupId := 3
-	
+
 	for _, info := range infos {
 
 		member_db, _ := FindUserByName(info.Name)
-		
+
 		fmt.Printf("%s\n", info.Generation)
 		fmt.Printf("%d: %s\n", member_db.MemberID, info.Name)
-		
+
 		m := &models.MemberInfo{
-			MemberID: member_db.MemberID,
-			Birthday: info.Birthday,
-			BloodType: info.BloodType,
-			Height: info.Height,
+			MemberID:   member_db.MemberID,
+			Birthday:   info.Birthday,
+			BloodType:  info.BloodType,
+			Height:     info.Height,
 			Generation: info.Generation,
 		}
 		m.BlogURL.String = info.BlogUrl

diff --git a/db/data/insert_member_tag.go b/db/data/insert_member_tag.go
@@ -1,16 +1,15 @@
 package data
 
 import (
-    "fmt"
+	"fmt"
 
+	models "github.com/android-project-46group/api-server/db/my_models"
 	_ "github.com/lib/pq"
-	models "web/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 )
 
-
 func InsertMemberTags() {
 	members, err := models.Members(qm.Select("*")).All(Ctx, DB)
 	if err != nil {
@@ -34,16 +33,16 @@ func InsertMemberTags() {
 			continue
 		}
 
-		m := &models.MemberTag {
+		m := &models.MemberTag{
 			MemberID: member.MemberID,
-			TagID: kTagId,
+			TagID:    kTagId,
 		}
 
 		m.Insert(Ctx, DB, boil.Infer())
 	}
 
 	// 2nd tag
-	azatoMembers := [] string {
+	azatoMembers := []string{
 		"宮田 愛萌", "渡邉 美穂", "齊藤 京子", "加藤 史帆", "影山 優佳",
 	}
 	// Tagid を入手する
@@ -59,9 +58,9 @@ func InsertMemberTags() {
 		if ExistMemberTag(mId, aTagId) {
 			continue
 		}
-		m := &models.MemberTag {
+		m := &models.MemberTag{
 			MemberID: mId,
-			TagID: aTagId,
+			TagID:    aTagId,
 		}
 
 		m.Insert(Ctx, DB, boil.Infer())

diff --git a/db/data/insert_position.go b/db/data/insert_position.go
@@ -3,7 +3,7 @@ package data
 import (
 	"fmt"
 
-	models "web/db/my_models"
+	models "github.com/android-project-46group/api-server/db/my_models"
 
 	"github.com/volatiletech/sqlboiler/v4/boil"
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
@@ -13,7 +13,7 @@ func InsertPositions() {
 	formations := LoadFormationFile("hinatazaka")
 
 	for _, formation := range formations {
-		
+
 		s_id, err := FindSongIdByTitle(formation.Title)
 		if err != nil {
 			continue
@@ -26,15 +26,15 @@ func InsertPositions() {
 				fmt.Println(memberName + " が DB 上に見つかりませんでした。")
 				continue
 			}
-	
+
 			m := &models.Position{
-				SongID: s_id,
+				SongID:   s_id,
 				MemberID: m_id,
 				Position: position.Position,
 			}
 			m.IsCenter.Bool = IsCenter(formation.Title, memberName)
 			m.IsCenter.Valid = true
-			m.Insert(Ctx, DB, boil.Infer())			
+			m.Insert(Ctx, DB, boil.Infer())
 		}
 	}
 }
@@ -67,44 +67,43 @@ func IsCenter(title string, name string) bool {
 	return false
 }
 
-var centerLists = map[string]string {
-	"ってか":"金村 美玖",
-	"思いがけないダブルレインボー": "金村 美玖",
-	"アディショナルタイム": "金村 美玖",
-	"何度でも何度でも": "上村 ひなの",
-	"君しか勝たん": "加藤 史帆",
-	"膨大な夢に押し潰されて": "加藤 史帆",
-	"アザトカワイイ": "佐々木 美玲",
-	"ソンナコトナイヨ": "小坂 菜緒",
+var centerLists = map[string]string{
+	"ってか": "金村 美玖",
+	"思いがけないダブルレインボー":    "金村 美玖",
+	"アディショナルタイム":        "金村 美玖",
+	"何度でも何度でも":          "上村 ひなの",
+	"君しか勝たん":            "加藤 史帆",
+	"膨大な夢に押し潰されて":       "加藤 史帆",
+	"アザトカワイイ":           "佐々木 美玲",
+	"ソンナコトナイヨ":          "小坂 菜緒",
 	"こんなに好きになっちゃっていいの？": "小坂 菜緒",
-	"ドレミソラシド": "小坂 菜緒",
-	"キュン": "小坂 菜緒",
+	"ドレミソラシド":           "小坂 菜緒",
+	"キュン":               "小坂 菜緒",
 }
 
-
-var nameConversions = map[string]string {
-	"潮紗理菜": "潮 紗理菜",
-	"影山優佳": "影山 優佳",
-	"加藤史帆": "加藤 史帆",
-	"齊藤京子": "齊藤 京子",
+var nameConversions = map[string]string{
+	"潮紗理菜":  "潮 紗理菜",
+	"影山優佳":  "影山 優佳",
+	"加藤史帆":  "加藤 史帆",
+	"齊藤京子":  "齊藤 京子",
 	"佐々木久美": "佐々木 久美",
 	"佐々木美玲": "佐々木 美玲",
-	"高瀬愛奈": "高瀬 愛奈",
-	"高本彩花": "高本 彩花",
-	"東村芽依": "東村 芽依",
-	"金村美玖": "金村 美玖",
-	"河田陽菜": "河田 陽菜",
-	"小坂菜緒": "小坂 菜緒",
-	"富田鈴花": "富田 鈴花",
-	"丹生明里": "丹生 明里",
+	"高瀬愛奈":  "高瀬 愛奈",
+	"高本彩花":  "高本 彩花",
+	"東村芽依":  "東村 芽依",
+	"金村美玖":  "金村 美玖",
+	"河田陽菜":  "河田 陽菜",
+	"小坂菜緒":  "小坂 菜緒",
+	"富田鈴花":  "富田 鈴花",
+	"丹生明里":  "丹生 明里",
 	"濱岸ひより": "濱岸 ひより",
-	"松田好花": "松田 好花",
-	"宮田愛萌": "宮田 愛萌",
-	"渡邉美穂": "渡邉 美穂",
+	"松田好花":  "松田 好花",
+	"宮田愛萌":  "宮田 愛萌",
+	"渡邉美穂":  "渡邉 美穂",
 	"上村ひなの": "上村 ひなの",
 	"髙橋未来虹": "髙橋 未来虹",
-	"森本茉莉": "森本 茉莉",
-	"山口陽世": "山口 陽世",
-	"柿崎芽実": "柿崎 芽実",
-	"井口眞緒": "井口 眞緒",
+	"森本茉莉":  "森本 茉莉",
+	"山口陽世":  "山口 陽世",
+	"柿崎芽実":  "柿崎 芽実",
+	"井口眞緒":  "井口 眞緒",
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"net/http"
-    	"web/db"
+    	"github.com/android-project-46group/api-server/db"
     )
     /*
@@ Expand Down @@