trueandco_analytics 0.4.7 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/trueandco_analytics/site/commands/session_c/put_data.rb +1 -1
- data/lib/trueandco_analytics/site/commands/user_c/create_or_update_user_if_exist.rb +4 -4
- data/lib/trueandco_analytics/site/controllers/reciver_controller.rb +8 -1
- data/lib/trueandco_analytics/site/workers/user_session_metric_worker.rb +1 -1
- data/lib/trueandco_analytics/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a23292bcf6baca1fd3fa340ed0d1105d6fcb483e
|
|
4
|
+
data.tar.gz: ba4d5c57d69085f0efb9a8135a73d305fcc12e0c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c5e855a0c71084051c32d1739ccfc36b44f5e6e8a908023ad532da5f9cbcfb0feecf514816f80606666b7540c3dcb96e87482e8884c70f57fb7a0940be5e43ae
|
|
7
|
+
data.tar.gz: 1928156c888c19dd1a7ecb52097ab7a83b4749fc64abc1d3d455fcd78fd3be1d5458b84528b27590904c07110e083285ff735613eed35c75378d1ddf685decec
|
|
@@ -16,7 +16,7 @@ module TrueandcoAnalytics::Site::SessionC
|
|
|
16
16
|
user_key = ::FNV.new.fnv1_32 userInfo.to_s
|
|
17
17
|
mange_job(user_key)
|
|
18
18
|
redis.rpush(user_key, json_data)
|
|
19
|
-
redis.expire(user_key, time_dead_session +
|
|
19
|
+
redis.expire(user_key, time_dead_session + 60)
|
|
20
20
|
end
|
|
21
21
|
end
|
|
22
22
|
|
|
@@ -2,12 +2,12 @@ module TrueandcoAnalytics::Site::UserC
|
|
|
2
2
|
class CreateOrUpdateUserIfExist
|
|
3
3
|
|
|
4
4
|
def initialize(user_agent, timestamp_end)
|
|
5
|
-
if user_agent.nil? || timestamp_end.nil?
|
|
5
|
+
if user_agent.nil? || user_agent.empty? || timestamp_end.nil?
|
|
6
6
|
raise ArgumentError.new("#{self.to_s} user_agent=#{user_agent} timestamp_end=#{timestamp_end}")
|
|
7
7
|
end
|
|
8
|
-
@user_agent = user_agent
|
|
8
|
+
@user_agent = user_agent['user_agent']
|
|
9
9
|
@timestamp_end = timestamp_end
|
|
10
|
-
@user_id =
|
|
10
|
+
@user_id = user_agent['user_id']
|
|
11
11
|
end
|
|
12
12
|
|
|
13
13
|
def execute
|
|
@@ -18,7 +18,7 @@ module TrueandcoAnalytics::Site::UserC
|
|
|
18
18
|
::TrueandcoAnalytics::MetricUser.create(user_id: user_id || 0, datetime_create: datetime_end,
|
|
19
19
|
last_active_datetime: datetime_end, hash_id: hash_id)
|
|
20
20
|
else
|
|
21
|
-
user.
|
|
21
|
+
user.update_attributes(last_active_datetime: datetime_end, user_id: @user_id)
|
|
22
22
|
user
|
|
23
23
|
end
|
|
24
24
|
user
|
|
@@ -8,10 +8,17 @@ module TrueandcoAnalytics::Site
|
|
|
8
8
|
data = data.merge({page_path: page_path}).to_json
|
|
9
9
|
request_info = {
|
|
10
10
|
'remote_ip' => request.remote_ip,
|
|
11
|
-
'user_agent' => request.user_agent
|
|
11
|
+
'user_agent' => request.user_agent,
|
|
12
|
+
'user_id' => user_id
|
|
12
13
|
}
|
|
13
14
|
SessionC::PutData.new(data, request_info, userInfo).execute
|
|
14
15
|
render nothing: true, status: 201, content_type: 'text/plain'
|
|
15
16
|
end
|
|
17
|
+
|
|
18
|
+
private
|
|
19
|
+
|
|
20
|
+
def user_id
|
|
21
|
+
@user_id ||= ::TrueandcoAnalytics::Config::Params.user_method&.id
|
|
22
|
+
end
|
|
16
23
|
end
|
|
17
24
|
end
|
|
@@ -12,7 +12,7 @@ module TrueandcoAnalytics::Site
|
|
|
12
12
|
return unless user_session_data.any?
|
|
13
13
|
first_point = user_session_data[0]
|
|
14
14
|
last_point = user_session_data[-1]
|
|
15
|
-
metric_user = UserC::CreateOrUpdateUserIfExist.new(info_request
|
|
15
|
+
metric_user = UserC::CreateOrUpdateUserIfExist.new(info_request, last_point['time']['timestamp']).execute
|
|
16
16
|
session = SessionC::Create.new(metric_user, first_point, last_point['time']['timestamp'], info_request).execute
|
|
17
17
|
MetricC::AddList.new(metric_user, session, user_session_data).execute
|
|
18
18
|
end
|