lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb in imperituroard-1.1.11 vs lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb in imperituroard-1.1.12
- old
+ new
@@ -189,14 +189,15 @@
{:code => 200, :result => "Data processed", :body => {:mess_to_recip => mess_to_recip}}
end
def delivery_report_transform(hub_report_in)
+
#{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber", "controller"=>"reports", "action"=>"delivery", "report"=>{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber"}}
#p hub_report
#p "hub_report"
- report_to_recip =
+ report_to_recip = []
data_for_status = {
23011 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by SMS",
:error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
},
@@ -221,44 +222,44 @@
}
if hub_report_in.key?("msg_status")
hub_report = hub_report_in
- if data_for_status[hub_report[:msg_status]] != nil && data_for_status[hub_report[:msg_status]] != {} && data_for_status[hub_report[:msg_status]] != [] && data_for_status[hub_report[:msg_status]] != ""
+ if data_for_status[hub_report["msg_status"]] != nil && data_for_status[hub_report["msg_status"]] != {} && data_for_status[hub_report["msg_status"]] != [] && data_for_status[hub_report["msg_status"]] != ""
+
report_to_recip.push({
"bulkId": "00000000-0000-0000-0000-000000000000",
- "messageId": hub_report[:report][:message_id],
- "to": hub_report[:report][:number],
+ "messageId": hub_report["report"]["message_id"],
+ "to": hub_report["report"]["number"],
# "sentAt": "2020-05-05T20:00:00.000+0000",
# "doneAt": "2020-05-05T20:00:00.000+0000",
"status": {
- "groupId": data_for_status[hub_report[:msg_status]][:status_grid],
- "groupName": data_for_status[hub_report[:msg_status]][:status_grname],
- "id": data_for_status[hub_report[:msg_status]][:status_id],
- "name": data_for_status[hub_report[:msg_status]][:status_name],
- "description": data_for_status[hub_report[:msg_status]][:status_descr]
+ "groupId": data_for_status[hub_report["msg_status"]][:status_grid],
+ "groupName": data_for_status[hub_report["msg_status"]][:status_grname],
+ "id": data_for_status[hub_report["msg_status"]][:status_id],
+ "name": data_for_status[hub_report["msg_status"]][:status_name],
+ "description": data_for_status[hub_report["msg_status"]][:status_descr]
},
"error": {
- "groupId": data_for_status[hub_report[:msg_status]][:error_grid],
- "groupName": data_for_status[hub_report[:msg_status]][:error_grname],
- "id": data_for_status[hub_report[:msg_status]][:error_id],
- "name": data_for_status[hub_report[:msg_status]][:error_name],
- "description": data_for_status[hub_report[:msg_status]][:error_descr],
- "permanent": data_for_status[hub_report[:msg_status]][:error_permanent]
+ "groupId": data_for_status[hub_report["msg_status"]][:error_grid],
+ "groupName": data_for_status[hub_report["msg_status"]][:error_grname],
+ "id": data_for_status[hub_report["msg_status"]][:error_id],
+ "name": data_for_status[hub_report["msg_status"]][:error_name],
+ "description": data_for_status[hub_report["msg_status"]][:error_descr],
+ "permanent": data_for_status[hub_report["msg_status"]][:error_permanent]
}
})
else
- report_to_recip["results"].app
report_to_recip.push({
"bulkId": "00000000-0000-0000-0000-000000000000",
- "messageId": hub_report[:report][:message_id],
- "to": hub_report[:report][:number],
+ "messageId": hub_report["report"]["message_id"],
+ "to": hub_report["report"]["number"],
# "sentAt": "2020-05-05T20:00:00.000+0000",
# "doneAt": "2020-05-05T20:00:00.000+0000",
"status": {
"groupId": 2,
"groupName": "UNDELIVERABLE_NOT_DELIVERED",
@@ -280,44 +281,42 @@
else
hub_report_in["_json"].each {|hub_report2|
- if data_for_status[hub_report[:msg_status]] != nil && data_for_status[hub_report[:msg_status]] != {} && data_for_status[hub_report[:msg_status]] != [] && data_for_status[hub_report[:msg_status]] != ""
+ if data_for_status[hub_report["msg_status"]] != nil && data_for_status[hub_report["msg_status"]] != {} && data_for_status[hub_report["msg_status"]] != [] && data_for_status[hub_report["msg_status"]] != ""
report_to_recip.push({
"bulkId": "00000000-0000-0000-0000-000000000000",
- "messageId": hub_report2[:message_id],
- "to": hub_report2[:number],
+ "messageId": hub_report2["message_id"],
+ "to": hub_report2["number"],
# "sentAt": "2020-05-05T20:00:00.000+0000",
# "doneAt": "2020-05-05T20:00:00.000+0000",
"status": {
- "groupId": data_for_status[hub_report2[:msg_status]][:status_grid],
- "groupName": data_for_status[hub_report2[:msg_status]][:status_grname],
- "id": data_for_status[hub_report2[:msg_status]][:status_id],
- "name": data_for_status[hub_report2[:msg_status]][:status_name],
- "description": data_for_status[hub_report2[:msg_status]][:status_descr]
+ "groupId": data_for_status[hub_report2["msg_status"]][:status_grid],
+ "groupName": data_for_status[hub_report2["msg_status"]][:status_grname],
+ "id": data_for_status[hub_report2["msg_status"]][:status_id],
+ "name": data_for_status[hub_report2["msg_status"]][:status_name],
+ "description": data_for_status[hub_report2["msg_status"]][:status_descr]
},
"error": {
- "groupId": data_for_status[hub_report2[:msg_status]][:error_grid],
- "groupName": data_for_status[hub_report2[:msg_status]][:error_grname],
- "id": data_for_status[hub_report2[:msg_status]][:error_id],
- "name": data_for_status[hub_report2[:msg_status]][:error_name],
- "description": data_for_status[hub_report2[:msg_status]][:error_descr],
- "permanent": data_for_status[hub_report2[:msg_status]][:error_permanent]
+ "groupId": data_for_status[hub_report2["msg_status"]][:error_grid],
+ "groupName": data_for_status[hub_report2["msg_status"]][:error_grname],
+ "id": data_for_status[hub_report2["msg_status"]][:error_id],
+ "name": data_for_status[hub_report2["msg_status"]][:error_name],
+ "description": data_for_status[hub_report2["msg_status"]][:error_descr],
+ "permanent": data_for_status[hub_report2["msg_status"]][:error_permanent]
}
})
else
- report_to_recip["results"].app
-
report_to_recip.push({
"bulkId": "00000000-0000-0000-0000-000000000000",
- "messageId": hub_report2[:message_id],
- "to": hub_report2[:number],
+ "messageId": hub_report2["message_id"],
+ "to": hub_report2["number"],
# "sentAt": "2020-05-05T20:00:00.000+0000",
# "doneAt": "2020-05-05T20:00:00.000+0000",
"status": {
"groupId": 2,
"groupName": "UNDELIVERABLE_NOT_DELIVERED",
@@ -333,12 +332,10 @@
"description": "Unknown error",
"permanent": false
}
})
end
-
}
-
end
{:code => 200, :result => "Data processed", :body => {:report_to_recip => {"results": report_to_recip}}}
end