Refactor code

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -3,6 +3,7 @@ package im_mysql_model
 import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/utils"
 	"time"
 )
 
@@ -124,17 +125,17 @@ func GetOwnerManagerByGroupID(groupID string) ([]db.GroupMember, error) {
 	return groupMemberList, nil
 }
 
-func GetGroupMemberNumByGroupID(groupID string) uint32 {
+func GetGroupMemberNumByGroupID(groupID string) (uint32, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
-		return 0
+		return 0, utils.Wrap(err, "DefaultGormDB failed")
 	}
 	var number uint32
 	err = dbConn.Table("group_members").Where("group_id=?", groupID).Count(&number).Error
 	if err != nil {
-		return 0
+		return 0, utils.Wrap(err, "")
 	}
-	return number
+	return number, nil
 }
 
 func GetGroupOwnerInfoByGroupID(groupID string) (*db.GroupMember, error) {

pkg/common/utils/utils.go

@@ -45,30 +45,40 @@ func GroupOpenIMCopyDB(dst *db.Group, src *open_im_sdk.GroupInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *db.Group) {
+func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *db.Group) error {
 	utils.CopyStructFields(dst, src)
-	user, _ := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
-	if user != nil {
-		dst.OwnerUserID = user.UserID
+	user, err := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
+	if err != nil {
+		return utils.Wrap(err, "")
+	}
+	dst.OwnerUserID = user.UserID
+
+	dst.MemberCount, err = imdb.GetGroupMemberNumByGroupID(src.GroupID)
+	if err != nil {
+		return utils.Wrap(err, "")
 	}
-	dst.MemberCount = imdb.GetGroupMemberNumByGroupID(src.GroupID)
 	dst.CreateTime = uint32(src.CreateTime.Unix())
+	return nil
 }
 
 func GroupMemberOpenIMCopyDB(dst *db.GroupMember, src *open_im_sdk.GroupMemberFullInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.GroupMember) {
+func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.GroupMember) error {
 	utils.CopyStructFields(dst, src)
 	if token_verify.IsMangerUserID(src.UserID) {
-		u, _ := imdb.GetUserByUserID(src.UserID)
-		if u != nil {
-			utils.CopyStructFields(dst, u)
+		u, err := imdb.GetUserByUserID(src.UserID)
+		if err != nil {
+			return utils.Wrap(err, "")
 		}
+
+		utils.CopyStructFields(dst, u)
+
 		dst.AppMangerLevel = 1
 	}
 	dst.JoinTime = src.JoinTime.Unix()
+	return nil
 }
 
 func GroupRequestOpenIMCopyDB(dst *db.GroupRequest, src *open_im_sdk.GroupRequest) {

pkg/utils/strings.go

@@ -31,7 +31,6 @@ func Int32ToString(i int32) string {
 
 //judge a string whether in the  string list
 func IsContain(target string, List []string) bool {
-
 	for _, element := range List {
 
 		if target == element {
@@ -39,7 +38,6 @@ func IsContain(target string, List []string) bool {
 		}
 	}
 	return false
-
 }
 
 func InterfaceArrayToStringArray(data []interface{}) (i []string) {