stores login fix

repositories/tenantRepository.go

@@ -30,7 +30,7 @@ type TenantRepository interface {
 	CheckTenantByNo(cno string) int
 	CreateTenantUser(data models.Tenants) (bool, error)
 	GetUserByNo(cno string) models.UserInfo
-	GetTenantByID(tid int, locationid int) (models.Tenantinfo, error)
+	GetTenantByID(tid int, locationid int, userid int) (models.Tenantinfo, error)
 	GetTenantByKeyword(keyword string) ([]models.TenantSearch, error)
 }
 
@@ -135,16 +135,15 @@ func (r *tenantRepository) GetAllTenants(pageno, pagesize, aid int, status, tena
 func (r *tenantRepository) GetTenantLocations(tid int) ([]models.Tenantlocations, error) {
 	var data []models.Tenantlocations
 
-	q1 := `SELECT a.*, b.roleid FROM tenantlocations a
-			LEFT JOIN app_users b ON a.locationid = b.locationid 
-    		AND a.tenantid = b.tenantid
-			WHERE a.tenantid = ?`
+	q1 := `SELECT * FROM tenantlocations WHERE tenantid = ?`
 
 	if err := r.db.Raw(q1, tid).Find(&data).Error; err != nil {
 		return nil, err
 	}
 
-	print(q1)
+	for i := range data {
+		data[i].Status = strings.ToLower(data[i].Status)
+	}
 
 	return data, nil
 }
@@ -651,9 +650,17 @@ func (r *tenantRepository) GetUserByNo(cno string) models.UserInfo {
 	return user
 }
 
-func (r *tenantRepository) GetTenantByID(tid int, locationid int) (models.Tenantinfo, error) {
+func (r *tenantRepository) GetTenantByID(tid int, locationid int, userid int) (models.Tenantinfo, error) {
 	var data models.Tenantinfo
 
+	if locationid == 0 && userid > 0 {
+		var userLocationID int
+		err := r.db.Table("app_users").Select("locationid").Where("userid = ?", userid).Row().Scan(&userLocationID)
+		if err == nil && userLocationID > 0 {
+			locationid = userLocationID
+		}
+	}
+
 	q1 := `
         SELECT a.*,b.categoryname,c.locationname AS applocation, d.allocationid AS allocationmode,e.typename AS allocationtype,e.mapid AS allocationid,f.locationid,
             f.locationname, f.contactno as locationcontact
@@ -678,6 +685,8 @@ func (r *tenantRepository) GetTenantByID(tid int, locationid int) (models.Tenant
 		return data, err
 	}
 
+	data.Status = strings.ToLower(data.Status)
+
 	return data, nil
 }
 

repositories/userRepository.go

@@ -83,6 +83,11 @@ func (r *userRepository) GetAllUsers(roleID, tenantID, pageno, pagesize int, key
 	if err := r.db.Raw(queryBuilder.String(), params...).Scan(&users).Error; err != nil {
 		return nil, err
 	}
+
+	for i := range users {
+		users[i].Status = strings.ToLower(users[i].Status)
+	}
+
 	return users, nil
 }
 
@@ -93,7 +98,7 @@ func (r *userRepository) GetUserByID(uid int) (models.UserInfo, error) {
 			a.firstname,a.lastname,concat(a.firstname,' ',a.lastname) as fullname,a.password,a.address,a.suburb,a.city,a.state,a.postcode,
 			a.userfcmtoken,a.pin,a.deviceid,a.devicetype,a.tenantid,a.shiftid,a.locationid,
 			a.applocationid,b.locationname as applocation,b.latitude as applatitude,b.longitude as applongitude, b.radius as appradius,
-			concat(c.starttime, ' - ', c.endtime) as shiftname
+			concat(c.starttime, ' - ', c.endtime) as shiftname, a.status
 		FROM app_users a
 		INNER JOIN app_location b ON a.applocationid = b.applocationid
 		LEFT JOIN ridershifts c ON a.shiftid = c.shiftid
@@ -103,6 +108,8 @@ func (r *userRepository) GetUserByID(uid int) (models.UserInfo, error) {
 		return models.UserInfo{}, err
 	}
 
+	user.Status = strings.ToLower(user.Status)
+
 	return user, nil
 }
 
@@ -248,7 +255,7 @@ func (r *userRepository) GetUserById(uid int) (models.UserInfo, error) {
 	q1 := `SELECT a.userid,a.authname,a.email,a.configid,a.roleid,a.authmode,a.contactno,
 			a.firstname,a.lastname,concat(a.firstname,' ',a.lastname) as fullname,a.password,a.address,a.suburb,a.city,a.state,a.postcode,
 			a.userfcmtoken,a.pin,a.deviceid,a.devicetype,a.tenantid,a.shiftid,
-			a.applocationid,b.locationname as applocation,b.latitude as applatitude,b.longitude as applongitude, b.radius as appradius , concat(c.starttime, ' - ', c.endtime) as shiftname                      
+			a.applocationid,b.locationname as applocation,b.latitude as applatitude,b.longitude as applongitude, b.radius as appradius , concat(c.starttime, ' - ', c.endtime) as shiftname, a.status                      
 			FROM app_users a
 			INNER JOIN app_location b on a.applocationid=b.applocationid
 			LEFT JOIN ridershifts c ON a.shiftid = c.shiftid
@@ -258,6 +265,8 @@ func (r *userRepository) GetUserById(uid int) (models.UserInfo, error) {
 		return models.UserInfo{}, err
 	}
 
+	user.Status = strings.ToLower(user.Status)
+
 	return user, nil
 }