refactor

Author: Jack Crish

src/app/containers/MainContainer.tsx

@@ -24,21 +24,21 @@ const mixpanel = require("mixpanel").init("12fa2800ccbf44a5c36c37bc9776e4c0", {
 const user = new MPID();
 
 //set current user cookie if it does not exist in cookies;
-if(!user.checkDocumentCookie(document)) {
-  console.log(" set user cookie ");
-  user.setCookie(document);
-  mixpanel.people.set( user.get_dId(), {"times": 1} );
+if(user.checkDocumentCookie(document)) {
+  console.log("Reactime user cookie defined. Check dId ");  
+  if( user.distinct_id ){
+    try{
+      user.setCookie();
+    }catch(e){
+      mixpanel.track(`Cannot set user cookie ${e}`);
+    }
+  }else{
 
-}else{  
-  //if a user visits increment the visit count;
-  //probably not necessary because of mixpanel, but .set() was acting strangely so this
-  // is an experiment to figure it out. 
-  console.log (" increment times ");
-  mixpanel.people.increment( user.get_dId(), "times" );
+  }
 }
 
 function mpClickTrack(e) {
-  mixpanel.track( { event: "click" } );
+  mixpanel.track({ event: "click", properties: { "$distinct_id": user.distinct_id } });
 };
 
 document.addEventListener("click", mpClickTrack);

src/app/user_id/user_id.js

@@ -1,44 +1,68 @@
 const crypto = require("crypto");
 const cookie = require("cookie");
-
+const mixpanel = require("mixpanel").init("12fa2800ccbf44a5c36c37bc9776e4c0", {
+  debug: true,
+  protocol: "https"
+});
 class MPID{
   constructor(){
     this.cookie = null;    
     this.distinct_id = null;
     this.hasCookie = false;    
   }
 
-  setCookie(doc){
+  setCookie(){
     console.log(" Set Cookie ");
-    //create a string of random data    
+    //create a string of random data        
     this.cookie = cookie.serialize("reactime", crypto.randomBytes(64).toString('hex') );
-    doc.cookie = this.cookie;
-    console.log(" Check if Cookie set ", doc.cookie);
-    return this.cookie;
+    this.distinct_id = this.cookie?.reactime?.slice(0, 20);
+    
+    if(this.cookie && this.distinct_id){
+      return this.cookie;    
+    }else{
+      throw new Error("Unable to set cookie. Cookie or Distinct Id is falsey");
+    }
+
   }
 
   getCookie(){
-    console.log(" get Cookie");    
-    return this.cookie;
+    console.log(" get Cookie");
+    
+    if(this.cookie){   
+      return this.cookie;
+    }else{
+      throw new Error("Cookie truthy, but unreturnable");
+    }
+  
   }
 
   checkDocumentCookie(doc){
     console.log(" Check Document Cookie ", cookie.parse( doc.cookie ));
-    if( doc.cookie ){
-      console.log( "doc cookie parsed: ", cookie.parse(doc.cookie)?.reactime );
-      let a = cookie.parse(doc.cookie)?.reactime;
-      if(a){
-        return true;
-      }else{
-        return false;
-      }
+    let parsedCookie = cookie.parse(doc.cookie);
+    
+    if( parsedCookie?.reactime ){      
+      console.log( "reactime cookie found" );
+      this.cookie = parsedCookie?.reactime;
+      
+      if(!this.distinct_id){
+        console.log(" set dId");
+        this.distinct_id = parsedCookie?.reactime?.slice(0, 20);
+      }    
     }else{
+      console.log("No reactime cookie found. Attempting setCookie");
+      this.setCookie();
       return false;
     }
   }
 
   get_dId(){
-    return this.cookie ? this.cookie.slice(0, 20) : null;
+    try{
+      if(this.distinct_id ) {        
+        return this.distinct_id;
+      }
+    }catch( e ){
+      throw new Error(`unable to set cookie. Reason: ${e}. `);
+    }
   }
 }
 

src/app/user_id/user_id.test.js

@@ -9,8 +9,8 @@ describe("Test new user class constructor", () => {
     expect(user).toBeInstanceOf(MPID);
   })
 
-  xit("new user cookie should be set", () => {
-    
+  it("new user cookie should be set", () => {
+    expect(user.setCookie()).toHaveLength();  
   })
 
   it("checkDocumentCookie should return a boolean", () => {