fix: use correct on-to-many relation uuid

linehk · Mar 7, 2024 · ca53e00 · ca53e00
1 parent 820fafa
commit ca53e00
Show file tree

Hide file tree

Showing 31 changed files with 104 additions and 584 deletions.
diff --git a/service/blog/rpc/internal/logic/get_blog_user_infos_logic.go b/service/blog/rpc/internal/logic/get_blog_user_infos_logic.go
@@ -53,7 +53,7 @@ func (l *GetBlogUserInfosLogic) GetBlogUserInfos(in *blog.GetBlogUserInfosReq) (
 	convert.Copy(&blogUserInfos.Blog, blogResp)
 	convert.Copy(&blogUserInfos.BlogUserInfo, blogUserInfoModel)
 	blogUserInfos.BlogUserInfo.Kind = "blogger#blogPerUserInfo"
-	blogUserInfos.BlogUserInfo.UserId = blogUserInfoModel.UserUuid
-	blogUserInfos.BlogUserInfo.BlogId = blogUserInfoModel.BlogUuid
+	blogUserInfos.BlogUserInfo.UserId = blogUserInfoModel.UserUuid.String
+	blogUserInfos.BlogUserInfo.BlogId = blogUserInfoModel.BlogUuid.String
 	return &blogUserInfos, nil
 }
diff --git a/service/blog/rpc/internal/test/get_blog_user_infos_logic_test.go b/service/blog/rpc/internal/test/get_blog_user_infos_logic_test.go
@@ -54,7 +54,7 @@ func TestGetBlogUserInfos(t *testing.T) {
 	blogModel := &model.Blog{
 		Id:             1,
 		Uuid:           blogId,
-		AppUserUuid:    userId,
+		AppUserUuid:    sql.NullString{String: userId, Valid: true},
 		Name:           sql.NullString{String: name, Valid: true},
 		Description:    sql.NullString{String: description, Valid: true},
 		Published:      sql.NullTime{Time: published, Valid: true},
@@ -93,15 +93,15 @@ func TestGetBlogUserInfos(t *testing.T) {
 			SelfLink: pageSelfLink2,
 		}},
 	}
-	
+
 	blogUserInfoUuid := uuid.NewString()
 	photosAlbumKey := "PhotosAlbumKey"
 	hasAdminAccess := true
 	userBlogInfoModel := &model.BlogUserInfo{
 		Id:             1,
 		Uuid:           blogUserInfoUuid,
-		UserUuid:       userId,
-		BlogUuid:       blogId,
+		UserUuid:       sql.NullString{String: userId, Valid: true},
+		BlogUuid:       sql.NullString{String: blogId, Valid: true},
 		PhotosAlbumKey: sql.NullString{String: photosAlbumKey, Valid: true},
 		HasAdminAccess: sql.NullBool{Bool: hasAdminAccess, Valid: true},
 	}

diff --git a/service/blog/rpc/internal/test/get_by_url_logic_test.go b/service/blog/rpc/internal/test/get_by_url_logic_test.go
@@ -49,7 +49,7 @@ func TestGetByUrl(t *testing.T) {
 	blogModel := &model.Blog{
 		Id:             1,
 		Uuid:           blogId,
-		AppUserUuid:    userId,
+		AppUserUuid:    sql.NullString{String: userId, Valid: true},
 		Name:           sql.NullString{String: name, Valid: true},
 		Description:    sql.NullString{String: description, Valid: true},
 		Published:      sql.NullTime{Time: published, Valid: true},

diff --git a/service/blog/rpc/internal/test/get_logic_test.go b/service/blog/rpc/internal/test/get_logic_test.go
@@ -49,7 +49,7 @@ func TestGet(t *testing.T) {
 	blogModel := &model.Blog{
 		Id:             1,
 		Uuid:           blogId,
-		AppUserUuid:    userId,
+		AppUserUuid:    sql.NullString{String: userId, Valid: true},
 		Name:           sql.NullString{String: name, Valid: true},
 		Description:    sql.NullString{String: description, Valid: true},
 		Published:      sql.NullTime{Time: published, Valid: true},

diff --git a/service/blog/rpc/internal/test/list_by_user_logic_test.go b/service/blog/rpc/internal/test/list_by_user_logic_test.go
@@ -50,7 +50,7 @@ func TestListByUser(t *testing.T) {
 		{
 			Id:             1,
 			Uuid:           blogId1,
-			AppUserUuid:    userId,
+			AppUserUuid:    sql.NullString{String: userId, Valid: true},
 			Name:           sql.NullString{String: name, Valid: true},
 			Description:    sql.NullString{String: description, Valid: true},
 			Published:      sql.NullTime{Time: published, Valid: true},
@@ -62,7 +62,7 @@ func TestListByUser(t *testing.T) {
 		{
 			Id:             2,
 			Uuid:           blogId2,
-			AppUserUuid:    userId,
+			AppUserUuid:    sql.NullString{String: userId, Valid: true},
 			Name:           sql.NullString{String: name, Valid: true},
 			Description:    sql.NullString{String: description, Valid: true},
 			Published:      sql.NullTime{Time: published, Valid: true},

diff --git a/service/blog/rpc/model/blog.sql b/service/blog/rpc/model/blog.sql
@@ -1,7 +1,7 @@
 CREATE TABLE blog (
   id SERIAL PRIMARY KEY,
   uuid VARCHAR UNIQUE NOT NULL,
-  app_user_uuid VARCHAR UNIQUE NOT NULL,
+  app_user_uuid VARCHAR,
   name VARCHAR,
   description VARCHAR,
   published TIMESTAMP,
@@ -14,8 +14,8 @@ CREATE TABLE blog (
 CREATE TABLE blog_user_info (
   id SERIAL PRIMARY KEY,
   uuid VARCHAR UNIQUE NOT NULL,
-  user_uuid VARCHAR UNIQUE NOT NULL,
-  blog_uuid VARCHAR UNIQUE NOT NULL,
+  user_uuid VARCHAR,
+  blog_uuid VARCHAR,
   photos_album_key VARCHAR,
   has_admin_access BOOLEAN
 );

diff --git a/service/blog/rpc/model/blog_model_gen.go b/service/blog/rpc/model/blog_model_gen.go
diff --git a/service/blog/rpc/model/blog_user_info_model_gen.go b/service/blog/rpc/model/blog_user_info_model_gen.go
diff --git a/service/blog/rpc/model/mock_blog_model.go b/service/blog/rpc/model/mock_blog_model.go
diff --git a/service/blog/rpc/model/mock_blog_user_info_model.go b/service/blog/rpc/model/mock_blog_user_info_model.go
diff --git a/service/comment/rpc/model/comment.sql b/service/comment/rpc/model/comment.sql
@@ -1,8 +1,8 @@
 CREATE TABLE comment (
   id SERIAL PRIMARY KEY,
   uuid VARCHAR UNIQUE NOT NULL,
-  blog_uuid VARCHAR UNIQUE NOT NULL,
-  post_uuid VARCHAR UNIQUE NOT NULL,
+  blog_uuid VARCHAR,
+  post_uuid VARCHAR,
   status VARCHAR,
   published TIMESTAMP,
   updated TIMESTAMP,