From e1899f8c119f15059f4f60c70a4e29f6564ead9e Mon Sep 17 00:00:00 2001
From: Patrick Peng Sun <patrick@lawipac.com>
Date: Tue, 11 Jul 2017 15:22:32 +1000
Subject: [PATCH] create lead from openID , build into function.

---
 crmLead.go        | 14 +++++++++++---
 eventSubscribe.go | 10 ++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/crmLead.go b/crmLead.go
index 76b45f0..2ad5cde 100644
--- a/crmLead.go
+++ b/crmLead.go
@@ -173,13 +173,17 @@ func importExistingWechatUserAsLead() {
 		_, found, err := crmFindLeadByOpenID(openID)
 
 		if !found && err == nil {
-			info := WechatUserInfo{}
-			info.getUserInfo(openID, "zh_CN")
-			info.registerNewLeadWithInfo(openID)
+			crmCreateLeadByOpenID(openID)
 		}
 	}
 }
 
+func crmCreateLeadByOpenID(openID string) (newuser crmdLead, err error) {
+	info := WechatUserInfo{}
+	info.getUserInfo(openID, "zh_CN")
+	return info.registerNewLeadWithInfo(openID)
+}
+
 func (m crmdLead) crmLeadConvert2Contact() (newContact crmdContact) {
 	newContact.convertFromLead(m.ID)
 	return
@@ -213,3 +217,7 @@ func (m crmdLead) Delete() bool {
 	}
 	return false
 }
+
+func (m crmdLead) avatarCacheURL() string {
+	return CRMConfig.CacheSiteURL + "?a=" + m.AvatarID
+}
diff --git a/eventSubscribe.go b/eventSubscribe.go
index 18d3696..690ce0b 100644
--- a/eventSubscribe.go
+++ b/eventSubscribe.go
@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-func onSubscribe(in* InWechatMsg) {
+func onSubscribe(in *InWechatMsg) {
 	openID := in.header.FromUserName
 	//check whether we have his own record in the CRM system
 	info, found, err := crmFindLeadByOpenID(openID)
@@ -25,9 +25,7 @@ func onSubscribe(in* InWechatMsg) {
 		sendGreeting4ExistingUser(in, info)
 	} else { //new user
 		//get user info from wechat
-		info := WechatUserInfo{}
-		info.getUserInfo(openID, "zh_CN")
-		info.registerNewLeadWithInfo(in.header.FromUserName)
+		crmCreateLeadByOpenID(openID)
 		in.askUserFillupBasicInfo()
 	}
 	//some error happened
@@ -88,7 +86,7 @@ func (in *InWechatMsg) askUserFillupBasicInfo() {
 	templateSendJoinCommunity(in.header.FromUserName, url, first, remark, communityName, joinDate)
 }
 
-func sendGreeting4ExistingUser(in* InWechatMsg, info crmdLead) {
+func sendGreeting4ExistingUser(in *InWechatMsg, info crmdLead) {
 
 	first := "欢迎" + info.Name + "返回澳洲校友会"
 	//url := "http://wechat.hitxy.org.au/profile_newly_register"
@@ -136,7 +134,7 @@ func (m *WechatUserInfo) uploadAvatar() (avatarID string, err error) {
 }
 
 //when user left
-func onUnSubscribe(in* InWechatMsg) {
+func onUnSubscribe(in *InWechatMsg) {
 	info, found, err := crmFindLeadByOpenID(in.header.FromUserName)
 
 	if err != nil {