Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/services/api_pb2_v1_helpers.py b/services/api_pb2_v1_helpers.py
index dcdea66..ea5e496 100644
--- a/services/api_pb2_v1_helpers.py
+++ b/services/api_pb2_v1_helpers.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Convert Monorail PB objects to API PB objects"""
@@ -22,9 +21,9 @@
from framework import framework_views
from framework import permissions
from framework import timestr
-from proto import api_pb2_v1
-from proto import project_pb2
-from proto import tracker_pb2
+from mrproto import api_pb2_v1
+from mrproto import project_pb2
+from mrproto import tracker_pb2
from services import project_svc
from tracker import field_helpers
from tracker import tracker_bizobj
@@ -219,7 +218,7 @@
return converted_phases
-def convert_issue(cls, issue, mar, services):
+def convert_issue(cls, issue, mar, services, migrated_id=None):
"""Convert Monorail Issue PB to API IssuesGetInsertResponse."""
config = services.config.GetProjectConfig(mar.cnxn, issue.project_id)
@@ -320,6 +319,8 @@
if issue.component_modified_timestamp:
resp.component_modified = datetime.datetime.fromtimestamp(
issue.component_modified_timestamp)
+ if migrated_id is not None:
+ resp.migrated_id = migrated_id
return resp