[Fix]: Pragyan api route, remove socketapi (#353)

* [Fix]: Change pragyan api to 21

* [Remove]: socketapi

config.json.example

@@ -2,8 +2,8 @@
    "Dev": {
       "Stage": "dev",
 
-      "EventId": "19",
-      "EventSecret": "5881add25851d3051e96a6b0be4bcaf1",
+      "EventId": "3",
+      "EventSecret": "a7b20fc00eca79eeced4790b79a9177a",
 
       "LogFileName": "stdout",
       "LogMaxSize": 50,
@@ -38,8 +38,8 @@
    "Docker": {
       "Stage": "docker",
 
-      "EventId": "19",
-      "EventSecret": "5881add25851d3051e96a6b0be4bcaf1",
+      "EventId": "3",
+      "EventSecret": "a7b20fc00eca79eeced4790b79a9177a",
 
       "LogFileName": "./dalalstreet_docker.log",
       "LogMaxSize": 50,
@@ -74,8 +74,8 @@
    "Prod": {
       "Stage": "prod",
 
-      "EventId": "19",
-      "EventSecret": "5881add25851d3051e96a6b0be4bcaf1",
+      "EventId": "3",
+      "EventSecret": "a7b20fc00eca79eeced4790b79a9177a",
 
       "LogFileName": "./dalalstreet.log",
       "LogMaxSize": 50,
@@ -110,8 +110,8 @@
    "Test": {
       "Stage": "test",
 
-      "EventId": "19",
-      "EventSecret": "5881add25851d3051e96a6b0be4bcaf1",
+      "EventId": "3",
+      "EventSecret": "a7b20fc00eca79eeced4790b79a9177a",
 
       "LogFileName": "stdout",
       "LogMaxSize": 50,

main.go

@@ -11,7 +11,6 @@ import (
 	"github.com/delta/dalal-street-server/matchingengine"
 	"github.com/delta/dalal-street-server/models"
 	"github.com/delta/dalal-street-server/session"
-	"github.com/delta/dalal-street-server/socketapi"
 	"github.com/delta/dalal-street-server/utils"
 )
 
@@ -32,7 +31,6 @@ func RealMain() {
 	datastreams.Init(config)
 	matchingengine.Init(config)
 	session.Init(config)
-	socketapi.Init(config)
 
 	// handle streams
 	datastreamsManager := datastreams.GetManager()
@@ -72,8 +70,6 @@ func RealMain() {
 				}
 				if utils.IsGrpcRequest(req) {
 					grpcapi.GrpcHandlerFunc(resp, req)
-				} else if req.URL.Path == "/ws" {
-					socketapi.Handle(resp, req)
 				} else if req.URL.Path == "/verify" {
 					if err := httpapi.HandleVerification(req); err != nil {
 						respText := fmt.Sprintf("%s", err.Error())

models/User.go

@@ -178,7 +178,7 @@ func Login(email, password string) (User, error) {
 	}
 
 	// Check if user has been verified or not only on docker
-	if config.Stage == "dev" && registeredUser.IsVerified == false {
+	if config.Stage == "docker" && registeredUser.IsVerified == false {
 		l.Errorf("User (%s) attempted login before verification", email)
 		return User{}, UnverifiedUserError
 	}
@@ -434,7 +434,7 @@ func postLoginToPragyan(email, password string) (pragyanUser, error) {
 	}
 
 	l.Debugf("Attempting login to Pragyan")
-	resp, err := http.PostForm("https://api.pragyan.org/20/event/login", form)
+	resp, err := http.PostForm("https://api.pragyan.org/21/event/login", form)
 	if err != nil {
 		l.Errorf("Pragyan API call failed: '%s'", err)
 		return pragyanUser{}, err
@@ -2404,7 +2404,6 @@ func SetBlockUser(userId uint32, isBlocked bool, penalty uint64) error {
 		}
 	}
 
-
 	oldCash := user.Cash
 
 	//Penalty added while blocking user
@@ -2423,7 +2422,7 @@ func SetBlockUser(userId uint32, isBlocked bool, penalty uint64) error {
 		UserID: userId,
 		Ub: &UserBlockState{
 			IsBlocked: isBlocked,
-			Cash:user.Cash,
+			Cash:      user.Cash,
 		},
 		GsType: UserBlockStateUpdate,
 	}

models/User_test.go

@@ -15,7 +15,7 @@ func Test_Login(t *testing.T) {
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 	//Tests case for first time pragyan login
-	httpmock.RegisterResponder("POST", "https://api.pragyan.org/20/event/login", httpmock.NewStringResponder(200, `{"status_code":200,"message": { "user_id": 2, "user_fullname": "TestName" , "user_name":"UserName", "user_country":"India" }}`))
+	httpmock.RegisterResponder("POST", "https://api.pragyan.org/21/event/login", httpmock.NewStringResponder(200, `{"status_code":200,"message": { "user_id": 2, "user_fullname": "TestName" , "user_name":"UserName", "user_country":"India" }}`))
 
 	u, err := Login("[email protected]", "password")
 	if err != nil {
@@ -62,7 +62,7 @@ func Test_Regsiter(t *testing.T) {
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 	//Tests case for first time pragyan login
-	httpmock.RegisterResponder("POST", "https://api.pragyan.org/20/event/login", httpmock.NewStringResponder(200, `{"status_code":200,"message": { "user_id": 2, "user_fullname": "TestName" , "user_name":"UserName", "user_country":"India"}}`))
+	httpmock.RegisterResponder("POST", "https://api.pragyan.org/21/event/login", httpmock.NewStringResponder(200, `{"status_code":200,"message": { "user_id": 2, "user_fullname": "TestName" , "user_name":"UserName", "user_country":"India"}}`))
 	err := RegisterUser("[email protected]", "password", "FullName", "")
 	defer func() {
 		db := getDB()
@@ -74,15 +74,15 @@ func Test_Regsiter(t *testing.T) {
 	}
 	httpmock.DeactivateAndReset()
 	httpmock.Activate()
-	httpmock.RegisterResponder("POST", "https://api.pragyan.org/20/event/login", httpmock.NewStringResponder(401, `{"status_code":401,"message": "Invalid Credentials"}`))
+	httpmock.RegisterResponder("POST", "https://api.pragyan.org/21/event/login", httpmock.NewStringResponder(401, `{"status_code":401,"message": "Invalid Credentials"}`))
 	err = RegisterUser("[email protected]", "password", "FullName", "")
 
 	if err != AlreadyRegisteredError {
 		t.Fatalf("Expected %+v but got %+v", AlreadyRegisteredError, err)
 	}
 	httpmock.DeactivateAndReset()
 	httpmock.Activate()
-	httpmock.RegisterResponder("POST", "https://api.pragyan.org/20/event/login", httpmock.NewStringResponder(400, `{"status_code":400,"message": "Account Not Registered"}`))
+	httpmock.RegisterResponder("POST", "https://api.pragyan.org/21/event/login", httpmock.NewStringResponder(400, `{"status_code":400,"message": "Account Not Registered"}`))
 	err = RegisterUser("[email protected]", "password", "FullName", "")
 	db := getDB()
 	registeredTestUser := &Registration{