Use Channel Type pids

hove-io · Oct 9, 2024 · dcc3a3f · dcc3a3f
1 parent c808ae1
commit dcc3a3f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 5 deletions.
diff --git a/source/chaos-proto b/source/chaos-proto
diff --git a/source/jormungandr/tests/disruptions_tests.py b/source/jormungandr/tests/disruptions_tests.py
@@ -682,7 +682,9 @@ def test_disruption_on_route_and_line(self):
         channel = get_not_null(message[2], 'channel')
         assert channel['id'] == 'beacon'
         assert channel['name'] == 'beacon channel'
-        assert len(channel['types']) == 3
+        assert len(channel['types']) == 4
+        assert 'web' in channel['types']
+        assert 'pids' in channel['types']
 
     def test_disruption_date_filtering(self):
         """

diff --git a/source/kraken/fill_disruption_from_database.h b/source/kraken/fill_disruption_from_database.h
@@ -471,6 +471,8 @@ struct DisruptionDatabaseReader {
             channel->add_types(chaos::Channel_Type_title);
         } else if (type_ == "beacon") {
             channel->add_types(chaos::Channel_Type_beacon);
+        } else if (type_ == "pids") {
+            channel->add_types(chaos::Channel_Type_pids);
         } else {
             channel->add_types(chaos::Channel_Type_unkown_type);
         }

diff --git a/source/kraken/make_disruption_from_chaos.cpp b/source/kraken/make_disruption_from_chaos.cpp
@@ -323,6 +323,9 @@ static std::set<nt::disruption::ChannelType> create_channel_types(const chaos::C
             case chaos::Channel_Type_beacon:
                 res.insert(nt::disruption::ChannelType::beacon);
                 break;
+            case chaos::Channel_Type_pids:
+                res.insert(nt::disruption::ChannelType::pids);
+                break;
             default:
                 res.insert(nt::disruption::ChannelType::unknown_type);
                 LOG4CPLUS_WARN(log4cplus::Logger::getInstance("log"),

diff --git a/source/navitia-proto b/source/navitia-proto
diff --git a/source/routing/tests/routing_api_test_data.h b/source/routing/tests/routing_api_test_data.h
@@ -822,7 +822,7 @@ struct routing_api_data {
                   "content type",
                   default_date,
                   default_date,
-                  {ChannelType::web, ChannelType::title, ChannelType::beacon},
+                  {ChannelType::web, ChannelType::title, ChannelType::beacon, ChannelType::pids},
                   {}});
 
         disruption_maker.impact()

diff --git a/source/type/message.h b/source/type/message.h
@@ -69,7 +69,7 @@ enum class Effect {
 
 enum class ActiveStatus { past = 0, active = 1, future = 2 };
 
-enum class ChannelType { web = 0, sms, email, mobile, notification, twitter, facebook, unknown_type, title, beacon };
+enum class ChannelType { web = 0, sms, email, mobile, notification, twitter, facebook, unknown_type, title, beacon, pids };
 
 inline std::string to_string(Effect effect) {
     switch (effect) {
@@ -149,6 +149,8 @@ inline std::string to_string(ChannelType ct) {
             return "title";
         case ChannelType::beacon:
             return "beacon";
+        case ChannelType::pids:
+            return "pids";
         default:
             throw navitia::exception("unhandled channeltype case");
     }

diff --git a/source/type/pb_converter.cpp b/source/type/pb_converter.cpp
@@ -1389,6 +1389,9 @@ void PbCreator::Filler::fill_pb_object(const nd::Impact* impact, pbnavitia::Impa
                 case nd::ChannelType::beacon:
                     pb_channel->add_channel_types(pbnavitia::Channel::beacon);
                     break;
+                case nd::ChannelType::pids:
+                    pb_channel->add_channel_types(pbnavitia::Channel::pids);
+                    break;
             }
         }
     }