Feature/profile settings and updates

api2/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${fileDirname}",
+            "env": {},
+            "args": []
+        }
+    ]
+}

api2/db/conn.go

@@ -37,4 +37,4 @@ func init() {
 	if err != nil {
 		log.Fatal(err)
 	}
-}
+}

api2/go.sum

@@ -11,10 +11,12 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
@@ -38,4 +40,4 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

api2/pkg/server/controller/user.go

@@ -1,20 +1,57 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
+	"ResnsBackend-api2/pkg/server/model"
+	"fmt"
+	"log"
 	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
-func HandleUserSet()gin.HandlerFunc{
-	return func(c *gin.Context) {
+var (
+	user model.User
+)
+
+//ユーザー情報
+func HandleUserSet() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		if err := context.ShouldBindJSON(&user); err != nil {
+			log.Println("[ERROR] Faild Bind JSON")
+			context.JSON(500, gin.H{"message": "Internal Server Error"})
+			return
+		}
+		uuid, err := uuid.NewRandom()
+		if err != nil {
+			context.JSON(http.StatusInternalServerError, "AuthToken is error")
+			return
+		}
+		user.Id = uuid.String()
+
+		fmt.Println("3333")
+		if err := model.Set(user); err != nil {
+			context.JSON(http.StatusInternalServerError, "Internal Server Error")
+			return
+		}
+		fmt.Println("4444")
 		// // 生成した認証トークンを返却
-		c.JSON(http.StatusOK,"" )
+		context.JSON(http.StatusOK, model.User{user.Id, user.Name, user.Image, user.Year, user.Month, user.Gender})
 	}
 }
 
-func HandleUserUpdate()gin.HandlerFunc{
-	return func(c *gin.Context) {
+//ユーザー情報更新
+func HandleUserUpdate() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		if err := context.BindJSON(&user); err != nil {
+			context.JSON(500, gin.H{"message": "Internal Server Error"})
+			return
+		}
+		if err := model.Update(user); err != nil {
+			context.JSON(http.StatusInternalServerError, "Internal Server Error")
+			return
+		}
 		// // 生成した認証トークンを返却
-		c.JSON(http.StatusOK,"" )
+		context.JSON(http.StatusOK, model.User{user.Id, user.Name, user.Image, user.Year, user.Month, user.Gender})
 	}
-}
+}

api2/pkg/server/model/user.go

@@ -0,0 +1,63 @@
+package model
+
+import (
+	"ResnsBackend-api2/db"
+	"fmt"
+	"strings"
+
+	"github.com/go-sql-driver/mysql"
+)
+
+type User struct {
+	Id     string `json:"id" `
+	Name   string `json:"name" `
+	Image  string `json:"image" `
+	Year   int    `json:"year" `
+	Month  int    `json:"month" `
+	Gender int    `json:"gender" `
+}
+
+var (
+//user *User
+)
+
+func Set(user User) error {
+	stmt, err := db.Conn.Prepare("INSERT INTO users(id,name,image,year,month,gender) VALUES(?,?,?,?,?,?)")
+	fmt.Println(user)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	fmt.Println("5555")
+	_, err = stmt.Exec(user.Id, user.Name, user.Image, user.Year, user.Month, user.Gender)
+	return err
+}
+
+func Update(user User) error {
+	stmt, err := db.Conn.Prepare("UPDATE users SET name=?, image=?, year=?, month=?, gender=? WHERE id=?")
+	if err != nil {
+		return err
+	}
+	defer stmt.Close()
+	if _, updErr := stmt.Exec(user.Id, user.Name, user.Image, user.Year, user.Month, user.Gender); updErr != nil {
+		return parseError(updErr)
+	}
+	return nil
+}
+
+func parseError(err error) error {
+	sqlErr, ok := err.(*mysql.MySQLError)
+	if !ok {
+		if strings.Contains(err.Error(), "no rows in result set") {
+			return fmt.Errorf("user not found")
+		}
+		return err
+	}
+	//以下,sql依存のエラー
+	switch sqlErr.Number {
+	case 1062:
+		//email_UNIQUE error
+		return fmt.Errorf("")
+	}
+	return err
+}

api2/pkg/server/server.go

@@ -14,7 +14,7 @@ var (
 func init() {
 	Server = gin.Default()
 	//アカウントに基づくプロフィールの設定
-	Server.POST("user/set",controller.HandleUserSet())
+	Server.POST("/user/set", controller.HandleUserSet())
 	//アカウントに基づくプロフィールの情報更新
-	Server.POST("user/update", controller.HandleUserUpdate())
-}
+	Server.POST("/user/update", controller.HandleUserUpdate())
+}

db/mysql/init/init.sql

@@ -2,40 +2,60 @@
 -- SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
 -- SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
 SET CHARSET UTF8;
+DROP SCHEMA IF EXISTS `resns_app`;
 CREATE SCHEMA IF NOT EXISTS `resns_app` DEFAULT CHARACTER SET utf8;
 USE `resns_app`;
 
+---- drop ----
+DROP TABLE IF EXISTS `users`;
+DROP TABLE IF EXISTS `users_genres`;
+DROP TABLE IF EXISTS `users_info`;
+DROP TABLE IF EXISTS `users_list`;
+DROP TABLE IF EXISTS `articles_contents`;
+DROP TABLE IF EXISTS `articles_tag`;
+DROP TABLE IF EXISTS `articles_comments`;
+DROP TABLE IF EXISTS `articles_nice_status`;
+
+---- create ----
 CREATE TABLE IF NOT EXISTS `resns_app`.`users` (
-`token`VARCHAR(64) NOT NULL COMMENT 'トークン',
-`user_id` VARCHAR(16) NOT NULL COMMENT 'ユーザID',
-`user_name` VARCHAR(16) NOT NULL COMMENT 'ユーザ名',
-`user_image` VARCHAR(128) NOT NULL COMMENT 'プロフィール画像',
-`yaer` int NOT NULL COMMENT '生年月日(年)',
-`month` int NOT NULL COMMENT '生年月日年代(月)',
+`id` VARCHAR(64) NOT NULL COMMENT 'ユーザID',
+`name` VARCHAR(64) NOT NULL COMMENT 'ユーザ名',
+`image` VARCHAR(128) NOT NULL COMMENT 'プロフィール画像',
+`year` int NOT NULL COMMENT '生年月日(年)',
+`month` int NOT NULL COMMENT '生年月日(月)',
 `gender` int NOT NULL COMMENT '性別',
-`genre1` int NOT NULL COMMENT 'ジャンル1',
-`genre2` int NOT NULL COMMENT 'ジャンル2',
-`genre3` int NOT NULL COMMENT 'ジャンル3',
-`genre4` int NOT NULL COMMENT 'ジャンル4',
-PRIMARY KEY (`user_id`),
-INDEX `idx_auth_token` (`user_id` ASC)
+PRIMARY KEY (`id`),
+INDEX `idx_auth_token` (`id` ASC)
 )
 ENGINE = InnoDB
 COMMENT = 'ユーザプロフィール';
 
+CREATE TABLE IF NOT EXISTS `resns_app`.`users_genres` (
+`id` VARCHAR(64) NOT NULL COMMENT 'ユーザID',
+`genre_1` int NOT NULL COMMENT '1つ目のジャンル',
+`genre_2` int NOT NULL COMMENT '2つ目のジャンル',
+`genre_3` int NOT NULL COMMENT '3つ目のジャンル',
+`genre_4` int NOT NULL COMMENT '4つ目のジャンル',
+PRIMARY KEY (`id`)
+)
+ENGINE = InnoDB
+COMMENT = 'ユーザ選択ジャンル';
+
 CREATE TABLE IF NOT EXISTS `resns_app`.`users_info` (
-`token`VARCHAR(64) NOT NULL COMMENT 'トークン',
-`user_mail_adress` VARCHAR(32) NOT NULL COMMENT 'メールアドレス',
-`user_password` VARCHAR(64) NOT NULL COMMENT 'パスワード',
-PRIMARY KEY (`token`)
+`id` VARCHAR(64) NOT NULL COMMENT 'ユーザID',
+`password` VARCHAR(64) NOT NULL COMMENT 'パスワード',
+PRIMARY KEY (`id`)
 )
 ENGINE = InnoDB
 COMMENT = 'ユーザ情報';
 
 CREATE TABLE IF NOT EXISTS `resns_app`.`users_list` (
-`user_id` VARCHAR(16) NOT NULL COMMENT 'ユーザID',
+`list_id` VARCHAR(64) NOT NULL COMMENT '識別ID',
+`user_id` VARCHAR(64) NOT NULL COMMENT 'ユーザID',
 `article_id` VARCHAR(64) NOT NULL COMMENT '記事識別ID',
-PRIMARY KEY (`user_id`)
+PRIMARY KEY (`list_id`),
+FOREIGN KEY (`user_id`)
+    REFERENCES `resns_app`.`users` (`id`)
 )
 ENGINE = InnoDB
 COMMENT = 'リスト';
@@ -47,20 +67,18 @@ CREATE TABLE IF NOT EXISTS `resns_app`.`articles_contents` (
 `context` VARCHAR(256) NOT NULL COMMENT '記事の内容',
 `genre` int NOT NULL COMMENT '記事のジャンル',
 `nice` int NOT NULL COMMENT 'いいね数',
-`ageYaer` int NOT NULL COMMENT '年代(年)',
-`ageMonth` int NOT NULL COMMENT '年代(月)',
+`age_yaer` int NOT NULL COMMENT '年代(年)',
+`age_month` int NOT NULL COMMENT '年代(月)',
 PRIMARY KEY (`article_id`)
 )
 ENGINE = InnoDB
 COMMENT = '記事の内容';
 
-CREATE TABLE IF NOT EXISTS `resns_app`.`articles_tags` (
+CREATE TABLE IF NOT EXISTS `resns_app`.`articles_tag` (
+`tag_id` VARCHAR(64) NOT NULL COMMENT 'タグID',
 `article_id` VARCHAR(64) NOT NULL COMMENT '記事識別ID',
-`article_tag1` VARCHAR(32) NOT NULL COMMENT '記事のタグ1',
-`article_tag2` VARCHAR(32) NOT NULL COMMENT '記事のタグ2',
-`article_tag3` VARCHAR(32) NOT NULL COMMENT '記事のタグ3',
-`article_tag4` VARCHAR(32) NOT NULL COMMENT '記事のタグ4',
-PRIMARY KEY (`article_id`)
+`article_tag` VARCHAR(32) NOT NULL COMMENT '記事のタグ',
+PRIMARY KEY (`tag_id`)
 )
 ENGINE = InnoDB
 COMMENT = '記事のタグ';
@@ -69,17 +87,22 @@ CREATE TABLE IF NOT EXISTS `resns_app`.`articles_comments` (
 `article_id` VARCHAR(64) NOT NULL COMMENT '記事識別ID',
 `comments_id` VARCHAR(64) NOT NULL COMMENT 'コメントのID',
 `comments_contents` VARCHAR(64) NOT NULL COMMENT 'コメントの内容',
-`user` VARCHAR(16) NOT NULL COMMENT 'ユーザID',
+`user_id` VARCHAR(64) NOT NULL COMMENT 'ユーザID',
 `user_image` VARCHAR(128) NOT NULL COMMENT 'ユーザーの画像',
-PRIMARY KEY (`article_id`)
+PRIMARY KEY (`comments_id`),
+FOREIGN KEY (`user_id`)
+    REFERENCES `resns_app`.`users` (`id`)
 )
 ENGINE = InnoDB
 COMMENT = '記事へのコメント';
 
 CREATE TABLE IF NOT EXISTS `resns_app`.`articles_nice_status` (
+`nice_id` VARCHAR(64) NOT NULL COMMENT 'NiceID',
 `article_id` VARCHAR(64) NOT NULL COMMENT '記事識別ID',
 `user_id` VARCHAR(16) NOT NULL COMMENT 'ユーザID',
-PRIMARY KEY (`article_id`)
+PRIMARY KEY (`nice_id`),
+FOREIGN KEY (`user_id`)
+    REFERENCES `resns_app`.`users` (`id`)
 )
 ENGINE = InnoDB
 COMMENT = '記事にいいねした人';
@@ -91,17 +114,41 @@ INSERT INTO `articles_contents` VALUES ('3', 'https://initial-practice.s3-ap-nor
 INSERT INTO `articles_contents` VALUES ('4', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg', 'Title_sample4','sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4',2,0,1940,6);
 INSERT INTO `articles_contents` VALUES ('5', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg', 'Title_sample5','sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5',5,123,2006,2 );
 
-INSERT INTO `users_info` VALUES ('1c22d6ef-b83a-47d9-a63d-b5d78cac4a87', 'b1018085@fun.ac.jp', 'ed968e840d10d2d313a870bc131a4e2c311d7ad09bdf32b3418147221f51a6e2');
+INSERT INTO `users_info` VALUES ('b1018085@fun.ac.jp', 'ed968e840d10d2d313a870bc131a4e2c311d7ad09bdf32b3418147221f51a6e2');
 
-INSERT INTO `users` VALUES ('1c22d6ef-b83a-47d9-a63d-b5d78cac4a87','taketo1234','taketo','https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jp',1999,8,0,1,2,3,4);
+INSERT INTO `users` VALUES ('b1018085@fun.ac.jp','taketo','https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jp',1999,8,1);
 
-INSERT INTO `articles_tags` VALUES ('1', '1_sampleTag1', '1_sampleTag2', '1_sampleTag3', '1_sampleTag4');
-INSERT INTO `articles_tags` VALUES ('2', '2_sampleTag1', '2_sampleTag2', '2_sampleTag3', '2_sampleTag4');
-INSERT INTO `articles_tags` VALUES ('3', '3_sampleTag1', '3_sampleTag2', '3_sampleTag3', '3_sampleTag4');
-INSERT INTO `articles_tags` VALUES ('4', '4_sampleTag1', '4_sampleTag2', '4_sampleTag3', '4_sampleTag4');
-INSERT INTO `articles_tags` VALUES ('5', '5_sampleTag1', '5_sampleTag2', '5_sampleTag3', '5_sampleTag4');
+INSERT INTO `articles_tag` VALUES ('1','1', '1_sampleTag1');
+INSERT INTO `articles_tag` VALUES ('2','1', '1_sampleTag2');
+INSERT INTO `articles_tag` VALUES ('3','1', '1_sampleTag3');
+INSERT INTO `articles_tag` VALUES ('4','1', '1_sampleTag4');
+INSERT INTO `articles_tag` VALUES ('5','2', '2_sampleTag1');
+INSERT INTO `articles_tag` VALUES ('6','2', '2_sampleTag2');
+INSERT INTO `articles_tag` VALUES ('7','2', '2_sampleTag3');
+INSERT INTO `articles_tag` VALUES ('8','2', '2_sampleTag4');
+INSERT INTO `articles_tag` VALUES ('9','3', '3_sampleTag1');
+INSERT INTO `articles_tag` VALUES ('10','3', '3_sampleTag2');
+INSERT INTO `articles_tag` VALUES ('11','3', '3_sampleTag3');
+INSERT INTO `articles_tag` VALUES ('12','3', '3_sampleTag4');
+INSERT INTO `articles_tag` VALUES ('13','4', '4_sampleTag1');
+INSERT INTO `articles_tag` VALUES ('14','4', '4_sampleTag2');
+INSERT INTO `articles_tag` VALUES ('15','4', '4_sampleTag3');
+INSERT INTO `articles_tag` VALUES ('16','4', '4_sampleTag4');
+INSERT INTO `articles_tag` VALUES ('17','5', '5_sampleTag1');
+INSERT INTO `articles_tag` VALUES ('18','5', '5_sampleTag2');
+INSERT INTO `articles_tag` VALUES ('19','5', '5_sampleTag3');
+INSERT INTO `articles_tag` VALUES ('20','5', '5_sampleTag4');
 
-INSERT INTO `articles_comments` VALUES ('1','2v43d6ef-a83d-57d0-f33d-b5d78ncj4a58','面白い','taketo1234','https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jp');
+INSERT INTO `articles_comments` VALUES ('1','2v43d6ef-a83d-57d0-f33d-b5d78ncj4a58','面白い','b1018085@fun.ac.jp','https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jp');
 
-INSERT INTO `users_list` VALUES ('1','taketo1234');
-INSERT INTO `users_list` VALUES ('5','taketo1234');
+INSERT INTO `users_list` VALUES ('1','b1018085@fun.ac.jp','1');
+INSERT INTO `users_list` VALUES ('2','b1018085@fun.ac.jp','4');
+COMMENT = '記事';
+
+
+---- insert ----
+INSERT INTO `articles` VALUES ('1', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/IMG_7004.jpeg', 'Title_sample1','五稜郭で飲んだ帰りsample1sample1sample1sample1sample1sample1sample1sample1',3,46,2020,6);
+INSERT INTO `articles` VALUES ('2', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg','Title_sample2', 'sample2sample2sample2sample2sample2sample2sample2sample2sample2sample2sample2sample2sample2',4,100,2000,5 );
+INSERT INTO `articles` VALUES ('3', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg','Title_sample3', 'sample3sample3sample3sample3sample3sample3sample3sample3sample3sample3sample3sample3sample3',1,2,1999,10 );
+INSERT INTO `articles` VALUES ('4', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg', 'Title_sample4','sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4sample4',2,0,1940,6);
+INSERT INTO `articles` VALUES ('5', 'https://initial-practice.s3-ap-northeast-1.amazonaws.com/sample.jpg', 'Title_sample5','sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5sample5',5,2006,2 );