sourceID2conversationID

pkg/utils/utils.go

@@ -1,17 +1,13 @@
 package utils
 
 import (
-	"bytes"
-	"encoding/json"
 	"hash/crc32"
 	"math/rand"
-	"reflect"
 	"runtime"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/gogo/protobuf/jsonpb"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
@@ -155,99 +151,18 @@ func OperationIDGenerator() string {
 	return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10)
 }
 
-func RemoveRepeatedStringInList(slc []string) []string {
-	var result []string
-	tempMap := map[string]byte{}
-	for _, e := range slc {
-		l := len(tempMap)
-		tempMap[e] = 0
-		if len(tempMap) != l {
-			result = append(result, e)
-		}
-	}
-	return result
-}
-
 func Pb2String(pb proto.Message) (string, error) {
-	marshaler := jsonpb.Marshaler{
-		OrigName:     true,
-		EnumsAsInts:  false,
-		EmitDefaults: false,
+	s, err := proto.Marshal(pb)
+	if err != nil {
+		return "", err
 	}
-	return marshaler.MarshalToString(pb)
+	return string(s), nil
 }
 
 func String2Pb(s string, pb proto.Message) error {
 	return proto.Unmarshal([]byte(s), pb)
 }
 
-func Map2Pb(m map[string]string) (pb proto.Message, err error) {
-	b, err := json.Marshal(m)
-	if err != nil {
-		return nil, err
-	}
-	err = proto.Unmarshal(b, pb)
-	if err != nil {
-		return nil, err
-	}
-	return pb, nil
-}
-
-func Pb2Map(pb proto.Message) (map[string]interface{}, error) {
-	_buffer := bytes.Buffer{}
-	jsonbMarshaller := &jsonpb.Marshaler{
-		OrigName:     true,
-		EnumsAsInts:  true,
-		EmitDefaults: false,
-	}
-	_ = jsonbMarshaller.Marshal(&_buffer, pb)
-	jsonCnt := _buffer.Bytes()
-	var out map[string]interface{}
-	err := json.Unmarshal(jsonCnt, &out)
-	return out, err
-}
-
-func JsonDataList(resp interface{}) []map[string]interface{} {
-	var list []proto.Message
-	if reflect.TypeOf(resp).Kind() == reflect.Slice {
-		s := reflect.ValueOf(resp)
-		for i := 0; i < s.Len(); i++ {
-			ele := s.Index(i)
-			list = append(list, ele.Interface().(proto.Message))
-		}
-	}
-
-	result := make([]map[string]interface{}, 0)
-	for _, v := range list {
-		m := ProtoToMap(v, false)
-		result = append(result, m)
-	}
-	return result
-}
-
-func JsonDataOne(pb proto.Message) map[string]interface{} {
-	return ProtoToMap(pb, false)
-}
-
-func ProtoToMap(pb proto.Message, idFix bool) map[string]interface{} {
-	marshaler := jsonpb.Marshaler{
-		OrigName:     true,
-		EnumsAsInts:  false,
-		EmitDefaults: false,
-	}
-
-	s, _ := marshaler.MarshalToString(pb)
-	out := make(map[string]interface{})
-	json.Unmarshal([]byte(s), &out)
-	if idFix {
-		if _, ok := out["id"]; ok {
-			out["_id"] = out["id"]
-			delete(out, "id")
-		}
-	}
-	return out
-}
-
 func GetHashCode(s string) uint32 {
 	return crc32.ChecksumIEEE([]byte(s))
 }