ezags-xsd 2.2.0.6 → 2.2.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (81) hide show
  1. data/app/mappers/act_record_adoption_mapper.rb +5 -5
  2. data/app/mappers/act_record_birth_mapper.rb +1 -1
  3. data/app/mappers/act_record_content_of_divorce_mapper.rb +2 -2
  4. data/app/mappers/act_record_content_of_marriage_mapper.rb +2 -2
  5. data/app/mappers/act_record_death_mapper.rb +3 -3
  6. data/app/mappers/act_record_divorce_mapper.rb +4 -4
  7. data/app/mappers/act_record_filiation_mapper.rb +2 -2
  8. data/app/mappers/act_record_marriage_mapper.rb +3 -3
  9. data/app/mappers/act_record_name_change_mapper.rb +3 -3
  10. data/app/mappers/act_record_to_certificate_name_change_mapper.rb +4 -0
  11. data/app/mappers/act_record_to_reference_name_change32_mapper.rb +4 -0
  12. data/app/mappers/applicant_organization_mapper.rb +1 -0
  13. data/app/mappers/applicant_person_mapper.rb +1 -0
  14. data/app/mappers/citizen_without_ident_doc_mapper.rb +1 -0
  15. data/app/mappers/dead_person_mapper.rb +1 -0
  16. data/app/mappers/documents_confirming_adoption_mapper.rb +1 -1
  17. data/app/mappers/documents_confirming_birth_mapper.rb +10 -5
  18. data/app/mappers/documents_confirming_death_mapper.rb +2 -2
  19. data/app/mappers/documents_confirming_marriage_mapper.rb +2 -2
  20. data/app/mappers/documents_confirming_perinatal_death_mapper.rb +2 -0
  21. data/app/mappers/full_address_mapper.rb +2 -2
  22. data/app/mappers/full_citizen_mapper.rb +1 -0
  23. data/app/mappers/full_person_mapper.rb +1 -0
  24. data/app/mappers/kladr_code13_mapper.rb +9 -0
  25. data/app/mappers/message_type_mapper.rb +17 -12
  26. data/app/mappers/mnemonic_type_mapper.rb +10 -0
  27. data/app/mappers/org_external_type_mapper.rb +1 -2
  28. data/app/mappers/other_information_and_official_annotations_mapper.rb +1 -0
  29. data/app/mappers/reference_type_mapper.rb +4 -2
  30. data/app/mappers/registrar_employee_mapper.rb +1 -0
  31. data/app/mappers/related_modified_documents_for_adoption_mapper.rb +2 -2
  32. data/app/mappers/requisites_paper_document_mapper.rb +1 -1
  33. data/app/mappers/requisites_statement_of_person_attented_at_birth_mapper.rb +1 -0
  34. data/app/mappers/service_type_mapper.rb +18 -0
  35. data/app/mappers/short_address_mapper.rb +2 -2
  36. data/app/mappers/signed_act_record_adoption_mapper.rb +1 -1
  37. data/app/mappers/signed_act_record_birth_mapper.rb +1 -1
  38. data/app/mappers/signed_act_record_death_mapper.rb +1 -1
  39. data/app/mappers/signed_act_record_divorce_mapper.rb +1 -1
  40. data/app/mappers/signed_act_record_filiation_mapper.rb +1 -1
  41. data/app/mappers/signed_act_record_marriage_mapper.rb +1 -1
  42. data/app/mappers/signed_act_record_name_change_mapper.rb +1 -1
  43. data/app/mappers/statement_content_of_divorce_mapper.rb +2 -2
  44. data/app/mappers/statement_content_of_marriage_mapper.rb +2 -10
  45. data/app/mappers/statement_of_divorce_mapper.rb +2 -2
  46. data/app/mappers/status_response_mapper.rb +80 -0
  47. data/app/mappers/sub_message_type_mapper.rb +5 -8
  48. data/app/mappers/time_stamp_version_mapper.rb +1 -1
  49. data/app/mappers/version_type_mapper.rb +10 -0
  50. data/bin/ezags-xsd +13 -0
  51. data/ezags-xsd.gemspec +1 -1
  52. data/lib/ezags-xsd/version.rb +1 -1
  53. data/spec/mappers/act_record_to_certificate_name_change_mapper_spec.rb +1 -0
  54. data/spec/mappers/act_record_to_reference_name_change32_mapper_spec.rb +1 -0
  55. data/spec/mappers/{change_order_info_mapper_spec.rb → kladr_code13_mapper_spec.rb} +1 -7
  56. data/spec/mappers/message_type_mapper_spec.rb +2 -0
  57. data/spec/mappers/mnemonic_type_mapper_spec.rb +16 -0
  58. data/spec/mappers/org_external_type_mapper_spec.rb +1 -1
  59. data/spec/mappers/reference_type_mapper_spec.rb +1 -0
  60. data/spec/mappers/service_type_mapper_spec.rb +18 -0
  61. data/spec/mappers/statement_content_of_marriage_mapper_spec.rb +0 -2
  62. data/spec/mappers/statement_of_divorce_mapper_spec.rb +1 -1
  63. data/spec/mappers/version_type_mapper_spec.rb +16 -0
  64. data/vendor/ezags-protocols/actor.xsd +32 -25
  65. data/vendor/ezags-protocols/common.xsd +59 -34
  66. data/vendor/ezags-protocols/documents.xsd +555 -581
  67. data/vendor/ezags-protocols/ePGU/EventServiceV25.wsdl +44 -43
  68. data/vendor/ezags-protocols/ePGU/event-service-v25.xsd +11 -3
  69. data/vendor/ezags-protocols/ePGU/event.xsd +69 -3
  70. data/vendor/ezags-protocols/ePGU/order-info.xsd +86 -88
  71. data/vendor/ezags-protocols/eZAGS/LocalInterDepPersonalService.xsd +194 -81
  72. data/vendor/ezags-protocols/eZAGS/LocalOrderService.xsd +30 -18
  73. data/vendor/ezags-protocols/eZAGS/public/InterDepPersonalService.wsdl +23 -0
  74. data/vendor/ezags-protocols/eZAGS/public/InterDepPersonalService.xsd +74 -0
  75. data/vendor/ezags-protocols/eZAGS/public/OrderService.wsdl +1 -1
  76. data/vendor/ezags-protocols/eZAGS/public/UploadService.xsd +50 -56
  77. data/vendor/ezags-protocols/externaldocuments.xsd +60 -36
  78. data/vendor/ezags-protocols/smev/smev.gosuslugi.ru.rev120315.xsd +436 -399
  79. metadata +36 -19
  80. checksums.yaml +0 -15
  81. data/app/mappers/change_order_info_mapper.rb +0 -83
@@ -6,7 +6,7 @@ class SignedActRecordDivorceMapper
6
6
  schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
7
  type 'SignedActRecordDivorce'
8
8
 
9
- # Запись АГС
9
+ # Актовая запись о расторжении брака
10
10
  # @return [ActRecordDivorceMapper]
11
11
  # minOccurs: 1, maxOccurs: 1
12
12
  attr_accessor :act_record
@@ -6,7 +6,7 @@ class SignedActRecordFiliationMapper
6
6
  schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
7
  type 'SignedActRecordFiliation'
8
8
 
9
- # Запись АГС
9
+ # Актовая запись об установлении отцовства
10
10
  # @return [ActRecordFiliationMapper]
11
11
  # minOccurs: 1, maxOccurs: 1
12
12
  attr_accessor :act_record
@@ -6,7 +6,7 @@ class SignedActRecordMarriageMapper
6
6
  schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
7
  type 'SignedActRecordMarriage'
8
8
 
9
- # Запись АГС
9
+ # Актовая запись о заключении брака
10
10
  # @return [ActRecordMarriageMapper]
11
11
  # minOccurs: 1, maxOccurs: 1
12
12
  attr_accessor :act_record
@@ -6,7 +6,7 @@ class SignedActRecordNameChangeMapper
6
6
  schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
7
  type 'SignedActRecordNameChange'
8
8
 
9
- # Запись АГС
9
+ # Актовая запись о перемене имени
10
10
  # @return [ActRecordNameChangeMapper]
11
11
  # minOccurs: 1, maxOccurs: 1
12
12
  attr_accessor :act_record
@@ -26,11 +26,11 @@ class StatementContentOfDivorceMapper
26
26
  # @return [Boolean]
27
27
  # minOccurs: 0, maxOccurs: 1
28
28
  attr_accessor :has_common_children_under_age
29
- # Фамилия мужа (после регистрации акта: брака или развода)
29
+ # ЕГО фамилия после регистрации АГС (заключения брака или расторжения брака)
30
30
  # @return [STRING60]
31
31
  # minOccurs: 1, maxOccurs: 1
32
32
  attr_accessor :new_last_name_of_husb
33
- # Фамилия жены (после после регистрации акта: брака или развода)
33
+ # ЕЕ фамилия после регистрации АГС (заключения брака или расторжения брака)
34
34
  # @return [STRING60]
35
35
  # minOccurs: 1, maxOccurs: 1
36
36
  attr_accessor :new_last_name_of_wife
@@ -6,14 +6,6 @@ class StatementContentOfMarriageMapper
6
6
  schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
7
  type 'StatementContentOfMarriage'
8
8
 
9
- # Желаемое время регистрации брака
10
- # @return [Time]
11
- # minOccurs: 0, maxOccurs: 1
12
- attr_accessor :desired_registraton_time
13
- # Желаемые дата регистрации брака
14
- # @return [Date]
15
- # minOccurs: 0, maxOccurs: 1
16
- attr_accessor :desired_registraton_date
17
9
  # Признак регистрации брака в торжественной обстановке
18
10
  # @return [Boolean]
19
11
  # minOccurs: 0, maxOccurs: 1
@@ -26,11 +18,11 @@ class StatementContentOfMarriageMapper
26
18
  # @return [NOTEmptyString]
27
19
  # minOccurs: 0, maxOccurs: 1
28
20
  attr_accessor :benefit_category_for_him
29
- # Фамилия мужа (после регистрации акта: брака или развода)
21
+ # ЕГО фамилия после регистрации АГС (заключения брака или расторжения брака)
30
22
  # @return [STRING60]
31
23
  # minOccurs: 1, maxOccurs: 1
32
24
  attr_accessor :new_last_name_of_husb
33
- # Фамилия жены (после после регистрации акта: брака или развода)
25
+ # ЕЕ фамилия после регистрации АГС (заключения брака или расторжения брака)
34
26
  # @return [STRING60]
35
27
  # minOccurs: 1, maxOccurs: 1
36
28
  attr_accessor :new_last_name_of_wife
@@ -18,10 +18,10 @@ class StatementOfDivorceMapper
18
18
  # @return [ParticipantsForDivorceMapper]
19
19
  # minOccurs: 1, maxOccurs: 1
20
20
  attr_accessor :participants
21
- # Документ, подтверждающий заключение брака между супругами
21
+ # Реквизиты АЗ и Свидетельства о браке
22
22
  # @return [ActRecAndCertMarriageRequisitesMapper]
23
23
  # minOccurs: 1, maxOccurs: 1
24
- attr_accessor :documents_confirming_marriage
24
+ attr_accessor :act_rec_and_cert_marriage_requisites
25
25
  # Приговор суда (при регистрации расторжения брака)
26
26
  # @return [CourtActVerdictMapper]
27
27
  # minOccurs: 0, maxOccurs: 1
@@ -40,4 +40,84 @@ class StatusResponseMapper
40
40
  attr_accessor :signature
41
41
  end
42
42
 
43
+ class MessageData::AppData::ChangeOrderInfo
44
+ include XmlSchemaMapper
45
+ schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/OrderService.xsd', File.dirname(__FILE__))
46
+ annonymus_type 'StatusResponse::MessageData::AppData::changeOrderInfo'
47
+
48
+ # Информация об услуги
49
+ # @return [ServiceInfoMapper]
50
+ # minOccurs: 0, maxOccurs: 1
51
+ attr_accessor :service_info
52
+ # Cтатус завки
53
+ # @return [OrderIdMapper]
54
+ # minOccurs: 1, maxOccurs: 1
55
+ attr_accessor :order_id
56
+ # Новый статус завки
57
+ # @return [StatusCodeMapper]
58
+ # minOccurs: 1, maxOccurs: 1
59
+ attr_accessor :status_code
60
+ # Комментарий
61
+ # @return [String]
62
+ # minOccurs: 0, maxOccurs: 1
63
+ attr_accessor :comment
64
+ # Возможность отмены
65
+ # @return [Boolean]
66
+ # minOccurs: 0, maxOccurs: 1
67
+ attr_accessor :cancel_allowed
68
+ # Токен безопасности
69
+ # @return [String]
70
+ # minOccurs: 1, maxOccurs: 1
71
+ attr_accessor :auth_token
72
+ end
73
+
74
+ class MessageData::AppData::ChangeOrderInfo::ServiceInfo
75
+ include XmlSchemaMapper
76
+ schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/OrderService.xsd', File.dirname(__FILE__))
77
+ annonymus_type 'StatusResponse::MessageData::AppData::changeOrderInfo::serviceInfo'
78
+
79
+ # Код ведомства в ПГУ
80
+ # @return [String]
81
+ # minOccurs: 0, maxOccurs: 1
82
+ attr_accessor :service_org_code
83
+ # Код формы услуги ПГУ
84
+ # @return [String]
85
+ # minOccurs: 0, maxOccurs: 1
86
+ attr_accessor :e_service_id
87
+ # Код цели в СРГУ
88
+ # @return [String]
89
+ # minOccurs: 0, maxOccurs: 1
90
+ attr_accessor :reestr_id
91
+ end
92
+
93
+ class MessageData::AppData::ChangeOrderInfo::OrderId
94
+ include XmlSchemaMapper
95
+ schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/OrderService.xsd', File.dirname(__FILE__))
96
+ annonymus_type 'StatusResponse::MessageData::AppData::changeOrderInfo::orderId'
97
+
98
+ # Id заявки на портале
99
+ # @return [String]
100
+ # minOccurs: 1, maxOccurs: 1
101
+ attr_accessor :pgu_id
102
+ # Id заявки в ведомстве
103
+ # @return [String]
104
+ # minOccurs: 1, maxOccurs: 1
105
+ attr_accessor :org_id
106
+ end
107
+
108
+ class MessageData::AppData::ChangeOrderInfo::StatusCode
109
+ include XmlSchemaMapper
110
+ schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/OrderService.xsd', File.dirname(__FILE__))
111
+ annonymus_type 'StatusResponse::MessageData::AppData::changeOrderInfo::statusCode'
112
+
113
+ # Код статуса в ведомстве
114
+ # @return [String]
115
+ # minOccurs: 1, maxOccurs: 1
116
+ attr_accessor :org_code
117
+ # Код статуса на ЕПГУ
118
+ # @return [String]
119
+ # minOccurs: 1, maxOccurs: 1
120
+ attr_accessor :tech_code
121
+ end
122
+
43
123
  end
@@ -13,9 +13,8 @@ class SubMessageTypeMapper
13
13
  # @return [StatusType]
14
14
  # minOccurs: 1, maxOccurs: 1
15
15
  attr_accessor :status
16
- # Данные о системе, инициировавашейинициировавшей цепочку из
17
- # нескольких запросов-ответов, объединенных единым процессом в рамках
18
- # взаимодействия
16
+ # Данные о системе, инициировавашей цепочку из нескольких запросов-ответов, объединенных
17
+ # единым процессом в рамках взаимодействия
19
18
  # @return [OrgExternalTypeMapper]
20
19
  # minOccurs: 0, maxOccurs: 1
21
20
  attr_accessor :originator
@@ -23,14 +22,12 @@ class SubMessageTypeMapper
23
22
  # @return [DateTime]
24
23
  # minOccurs: 1, maxOccurs: 1
25
24
  attr_accessor :date
26
- # Идентификатор сообщения-запроса, инициировавшего
27
- # взаимодействие
25
+ # Идентификатор сообщения-запроса, инициировавшего взаимодействие
28
26
  # @return [IdType]
29
27
  # minOccurs: 0, maxOccurs: 1
30
28
  attr_accessor :request_id_ref
31
- # Идентификатор сообщения-запроса, инициировавшего
32
- # цепочку из нескольких запросов-ответов, объединенных единым
33
- # процессом в рамках взаимодействия
29
+ # Идентификатор сообщения-запроса, инициировавшего цепочку из нескольких запросов-ответов,
30
+ # объединенных единым процессом в рамках взаимодействия
34
31
  # @return [IdType]
35
32
  # minOccurs: 0, maxOccurs: 1
36
33
  attr_accessor :origin_request_id_ref
@@ -1,5 +1,5 @@
1
1
  # encoding: utf-8
2
- # @note Временной интервал ограничен датами с 1 января 1910 года по 1 января 2020 года
2
+ # @note Временной интервал ограничен минимальной датой - 1 января 1900 года
3
3
 
4
4
  class TimeStampVersionMapper
5
5
  include XmlSchemaMapper
@@ -0,0 +1,10 @@
1
+ # encoding: utf-8
2
+ # @note Формат версии
3
+
4
+ class VersionTypeMapper
5
+ include XmlSchemaMapper
6
+ schema File.expand_path('../../vendor/ezags-protocols/eZAGS/public/UploadService.xsd', File.dirname(__FILE__))
7
+ type 'VersionType'
8
+
9
+
10
+ end
data/bin/ezags-xsd CHANGED
@@ -24,6 +24,19 @@ class CLI < Thor
24
24
  replace_paths
25
25
  end
26
26
 
27
+ desc 'update_protocols', 'update ezags protocols'
28
+ method_option :path, aliases: '-p', desc: 'temporary path', type: :string, default: 'tmp'
29
+ method_option :branch, aliases: '-b', desc: 'actual branch', type: :string, default: '2.2/develop'
30
+ def update_protocols
31
+ `git clone gitolite@git.egov.at-consulting.ru:ezags-protocols.git #{options[:path]}`
32
+ Dir.chdir options[:path]
33
+ `git checkout #{options[:branch]}`
34
+ Dir.chdir '../'
35
+ `cp -rf #{options[:path]}/* vendor/ezags-protocols`
36
+ ensure
37
+ FileUtils.rm_rf options[:path]
38
+ end
39
+
27
40
  no_tasks do
28
41
  def replace_paths
29
42
  path = File.join File.expand_path('../../app/mappers', __FILE__), '*'
data/ezags-xsd.gemspec CHANGED
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
17
17
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
18
18
  gem.require_paths = %w(lib app/mappers)
19
19
 
20
- gem.add_dependency('xml_schema_mapper', '>= 0.0.6')
20
+ gem.add_dependency('xml_schema_mapper', '>= 0.0.8')
21
21
  gem.add_dependency('libxml-ruby', '>= 2.6.0')
22
22
 
23
23
  gem.add_development_dependency('rspec')
@@ -1,5 +1,5 @@
1
1
  module Ezags
2
2
  module Xsd
3
- VERSION = '2.2.0.6'
3
+ VERSION = '2.2.6.1'
4
4
  end
5
5
  end
@@ -6,6 +6,7 @@ require "xml_schema_mapper/test_builder"
6
6
  # @attr actRecordNumber [ACT_RECORD_NUMBER]
7
7
  # @attr actRecordDate [DateRecord]
8
8
  # @attr isRecovered [boolean]
9
+ # @attr content [ActRecordContentOfNameChange]
9
10
  # @attr participants [ActRecordParticipantsForNameChange]
10
11
 
11
12
 
@@ -6,6 +6,7 @@ require "xml_schema_mapper/test_builder"
6
6
  # @attr actRecordNumber [ACT_RECORD_NUMBER]
7
7
  # @attr actRecordDate [DateRecord]
8
8
  # @attr isRecovered [boolean]
9
+ # @attr content [ActRecordContentOfNameChange]
9
10
  # @attr participants [ActRecordParticipantsForNameChange]
10
11
 
11
12
 
@@ -1,15 +1,9 @@
1
1
  require 'spec_helper'
2
2
  require "xml_schema_mapper/test_builder"
3
3
 
4
- # @attr serviceInfo []
5
- # @attr orderId []
6
- # @attr statusCode []
7
- # @attr comment [string]
8
- # @attr cancelAllowed [boolean]
9
- # @attr authToken [string]
10
4
 
11
5
 
12
- describe ChangeOrderInfoMapper do
6
+ describe KladrCode13Mapper do
13
7
 
14
8
  include XmlSchemaMapper::TestBuilder::Helper
15
9
 
@@ -5,6 +5,7 @@ require "xml_schema_mapper/test_builder"
5
5
  # @attr Recipient [orgExternalType]
6
6
  # @attr Originator [orgExternalType]
7
7
  # @attr ServiceName [string]
8
+ # @attr Service [ServiceType]
8
9
  # @attr TypeCode [TypeCodeType]
9
10
  # @attr Status [StatusType]
10
11
  # @attr Date [dateTime]
@@ -15,6 +16,7 @@ require "xml_schema_mapper/test_builder"
15
16
  # @attr CaseNumber [string]
16
17
  # @attr SubMessages [SubMessagesType]
17
18
  # @attr TestMsg [string]
19
+ # @attr OKTMO [string]
18
20
 
19
21
 
20
22
  describe MessageTypeMapper do
@@ -0,0 +1,16 @@
1
+ require 'spec_helper'
2
+ require "xml_schema_mapper/test_builder"
3
+
4
+
5
+
6
+ describe MnemonicTypeMapper do
7
+
8
+ include XmlSchemaMapper::TestBuilder::Helper
9
+
10
+ subject { build_described_mapper }
11
+
12
+ it "should be self-compatible xml <-> object" do
13
+ described_class.parse(subject.to_xml).to_xml.should eql subject.to_xml
14
+ end
15
+
16
+ end
@@ -1,7 +1,7 @@
1
1
  require 'spec_helper'
2
2
  require "xml_schema_mapper/test_builder"
3
3
 
4
- # @attr Code [string]
4
+ # @attr Code [MnemonicType]
5
5
  # @attr Name [string]
6
6
 
7
7
 
@@ -1,6 +1,7 @@
1
1
  require 'spec_helper'
2
2
  require "xml_schema_mapper/test_builder"
3
3
 
4
+ # @attr Include [string]
4
5
 
5
6
 
6
7
  describe ReferenceTypeMapper do
@@ -0,0 +1,18 @@
1
+ require 'spec_helper'
2
+ require "xml_schema_mapper/test_builder"
3
+
4
+ # @attr Mnemonic [string]
5
+ # @attr Version [VersionType]
6
+
7
+
8
+ describe ServiceTypeMapper do
9
+
10
+ include XmlSchemaMapper::TestBuilder::Helper
11
+
12
+ subject { build_described_mapper }
13
+
14
+ it "should be self-compatible xml <-> object" do
15
+ described_class.parse(subject.to_xml).to_xml.should eql subject.to_xml
16
+ end
17
+
18
+ end
@@ -1,8 +1,6 @@
1
1
  require 'spec_helper'
2
2
  require "xml_schema_mapper/test_builder"
3
3
 
4
- # @attr desiredRegistratonTime [time]
5
- # @attr desiredRegistratonDate [date]
6
4
  # @attr celebrationNeeded [boolean]
7
5
  # @attr benefitCategoryForHer [NOT_EMPTY_STRING]
8
6
  # @attr benefitCategoryForHim [NOT_EMPTY_STRING]
@@ -4,7 +4,7 @@ require "xml_schema_mapper/test_builder"
4
4
  # @attr statementRequisites [StatementRequisites]
5
5
  # @attr statementContent [StatementContentOfDivorce]
6
6
  # @attr participants [ParticipantsForDivorce]
7
- # @attr documentsConfirmingMarriage [ActRecAndCertMarriageRequisites]
7
+ # @attr actRecAndCertMarriageRequisites [ActRecAndCertMarriageRequisites]
8
8
  # @attr courtVerdictOfDivorce [CourtActVerdict]
9
9
  # @attr courtDecisionOfDivorce [CourtActDecision]
10
10
  # @attr documentConfirmingBenefitForHim [RequisitesPaperDocument]
@@ -0,0 +1,16 @@
1
+ require 'spec_helper'
2
+ require "xml_schema_mapper/test_builder"
3
+
4
+
5
+
6
+ describe VersionTypeMapper do
7
+
8
+ include XmlSchemaMapper::TestBuilder::Helper
9
+
10
+ subject { build_described_mapper }
11
+
12
+ it "should be self-compatible xml <-> object" do
13
+ described_class.parse(subject.to_xml).to_xml.should eql subject.to_xml
14
+ end
15
+
16
+ end
@@ -1,5 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!-- edited with XMLSpy v2011 rel. 2 (http://www.altova.com) by Andrey (Uncommercial) -->
2
+ <!-- edited with XMLSpy v2011 rel. 2 (http://www.altova.com) by free (free) -->
3
3
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cm="http://ezags.rt.ru/type/common/" xmlns:ac="http://ezags.rt.ru/type/actor/" targetNamespace="http://ezags.rt.ru/type/actor/" elementFormDefault="qualified" attributeFormDefault="unqualified">
4
4
  <xs:import namespace="http://ezags.rt.ru/type/common/" schemaLocation="common.xsd"/>
5
5
  <xs:complexType name="FullPerson">
@@ -7,8 +7,8 @@
7
7
  <xs:documentation>Сведения о человеке (максимальный набор)</xs:documentation>
8
8
  </xs:annotation>
9
9
  <xs:sequence minOccurs="1">
10
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
11
- <xs:element ref="cm:isApplicant" minOccurs="0"/>
10
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
11
+ <xs:element ref="cm:isApplicant" minOccurs="0"/>
12
12
  <xs:element ref="cm:surname" minOccurs="0"/>
13
13
  <xs:element ref="cm:firstName" minOccurs="0"/>
14
14
  <xs:element ref="cm:patronymic" minOccurs="0"/>
@@ -28,12 +28,11 @@
28
28
  <xs:element ref="cm:deathPlace" minOccurs="0"/>
29
29
  <xs:element ref="cm:phoneNumber" minOccurs="0"/>
30
30
  <xs:element ref="cm:workPhoneNumber" minOccurs="0"/>
31
- <!-- Надо сделать списковыми сущностями с обязательностью заполнения хотя бы одного -->
32
31
  <xs:element ref="cm:identityDocument" minOccurs="0"/>
33
- <xs:choice minOccurs="0">
34
- <xs:element ref="cm:powerOfAttorney"/>
35
- <xs:element ref="cm:powerOfAttorneyLegal"/>
36
- </xs:choice>
32
+ <xs:choice minOccurs="0">
33
+ <xs:element ref="cm:powerOfAttorney"/>
34
+ <xs:element ref="cm:powerOfAttorneyLegal"/>
35
+ </xs:choice>
37
36
  </xs:sequence>
38
37
  </xs:complexType>
39
38
  <xs:complexType name="Employee">
@@ -79,7 +78,7 @@
79
78
  <xs:complexContent>
80
79
  <xs:restriction base="ac:FullPerson">
81
80
  <xs:sequence minOccurs="1">
82
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
81
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
83
82
  <xs:element ref="cm:isApplicant" minOccurs="0"/>
84
83
  <xs:element ref="cm:surname"/>
85
84
  <xs:element ref="cm:firstName"/>
@@ -115,12 +114,12 @@
115
114
  <xs:complexContent>
116
115
  <xs:restriction base="ac:FullCitizen">
117
116
  <xs:sequence minOccurs="1">
118
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
117
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
119
118
  <xs:element ref="cm:isApplicant" minOccurs="0"/>
120
119
  <xs:element ref="cm:surname"/>
121
120
  <xs:element ref="cm:firstName"/>
122
121
  <xs:element ref="cm:patronymic" minOccurs="0"/>
123
- <xs:element ref="cm:gender" minOccurs="0"/>
122
+ <xs:element ref="cm:gender" minOccurs="0"/>
124
123
  <xs:element ref="cm:birthDate" minOccurs="0"/>
125
124
  <xs:element ref="cm:birthPlace" minOccurs="0"/>
126
125
  <xs:element ref="cm:citizenship" minOccurs="0"/>
@@ -128,7 +127,7 @@
128
127
  <xs:element ref="cm:nationality" minOccurs="0"/>
129
128
  <xs:element ref="cm:nationalityString" minOccurs="0"/>
130
129
  <xs:element ref="cm:residencePlace" minOccurs="0"/>
131
- <xs:element ref="cm:snils" minOccurs="0"/>
130
+ <xs:element ref="cm:snils" minOccurs="0"/>
132
131
  </xs:sequence>
133
132
  </xs:restriction>
134
133
  </xs:complexContent>
@@ -150,7 +149,7 @@
150
149
  <xs:complexContent>
151
150
  <xs:restriction base="ac:CitizenWithoutIdentDoc">
152
151
  <xs:sequence minOccurs="1">
153
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
152
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
154
153
  <xs:element ref="cm:isApplicant" minOccurs="0"/>
155
154
  <xs:element ref="cm:surname"/>
156
155
  <xs:element ref="cm:firstName"/>
@@ -188,7 +187,7 @@
188
187
  <xs:complexContent>
189
188
  <xs:restriction base="ac:FullPerson">
190
189
  <xs:sequence minOccurs="1">
191
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
190
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
192
191
  <xs:element ref="cm:isApplicant"/>
193
192
  <xs:element ref="cm:surname"/>
194
193
  <xs:element ref="cm:firstName"/>
@@ -222,7 +221,7 @@
222
221
  <xs:complexContent>
223
222
  <xs:restriction base="ac:FullPerson">
224
223
  <xs:sequence minOccurs="1">
225
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
224
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
226
225
  <xs:element ref="cm:isApplicant" minOccurs="0"/>
227
226
  <xs:element ref="cm:surname"/>
228
227
  <xs:element ref="cm:firstName"/>
@@ -235,10 +234,10 @@
235
234
  <xs:element ref="cm:phoneNumber" minOccurs="0"/>
236
235
  <xs:element ref="cm:workPhoneNumber" minOccurs="0"/>
237
236
  <xs:element ref="cm:identityDocument" minOccurs="0"/>
238
- <xs:choice minOccurs="0">
239
- <xs:element ref="cm:powerOfAttorney"/>
240
- <xs:element ref="cm:powerOfAttorneyLegal"/>
241
- </xs:choice>
237
+ <xs:choice minOccurs="0">
238
+ <xs:element ref="cm:powerOfAttorney"/>
239
+ <xs:element ref="cm:powerOfAttorneyLegal"/>
240
+ </xs:choice>
242
241
  </xs:sequence>
243
242
  </xs:restriction>
244
243
  </xs:complexContent>
@@ -281,7 +280,7 @@
281
280
  <xs:element ref="cm:nationality" minOccurs="0"/>
282
281
  <xs:element ref="cm:nationalityString" minOccurs="0"/>
283
282
  <xs:element ref="cm:residencePlace" minOccurs="0"/>
284
- <xs:element ref="cm:snils" minOccurs="0"/>
283
+ <xs:element ref="cm:snils" minOccurs="0"/>
285
284
  <xs:element ref="cm:deathDate"/>
286
285
  <xs:element ref="cm:deathPlace"/>
287
286
  <xs:element ref="cm:identityDocument" minOccurs="0"/>
@@ -303,7 +302,7 @@
303
302
  <xs:complexContent>
304
303
  <xs:restriction base="ac:FullPerson">
305
304
  <xs:sequence minOccurs="1">
306
- <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
305
+ <xs:element ref="cm:isPrivateOfficeOwner" minOccurs="0"/>
307
306
  <xs:element ref="cm:isApplicant" minOccurs="0"/>
308
307
  <xs:element ref="cm:surname"/>
309
308
  <xs:element ref="cm:firstName" minOccurs="0"/>
@@ -356,7 +355,7 @@
356
355
  <xs:element ref="cm:legalAddress" minOccurs="0"/>
357
356
  <xs:element ref="ac:employees" minOccurs="0"/>
358
357
  <xs:element ref="ac:headOfZAGS" minOccurs="0"/>
359
- <xs:element ref="cm:oktmo" />
358
+ <xs:element ref="cm:oktmo"/>
360
359
  <xs:element ref="cm:dateBegin"/>
361
360
  <xs:element ref="cm:dateClose" minOccurs="0"/>
362
361
  <xs:element name="registrarArchUID" type="cm:registrarUID" minOccurs="0">
@@ -365,7 +364,7 @@
365
364
  </xs:annotation>
366
365
  </xs:element>
367
366
  <xs:element ref="cm:serviceTypes" minOccurs="0"/>
368
- <xs:element ref="cm:version"/>
367
+ <xs:element ref="cm:version"/>
369
368
  </xs:sequence>
370
369
  </xs:complexType>
371
370
  <xs:element name="foreignId" type="cm:RegistrarIdentity">
@@ -399,8 +398,16 @@
399
398
  <xs:documentation>Сотрудник органа ЗАГС, зарегистрировавший акт</xs:documentation>
400
399
  </xs:annotation>
401
400
  </xs:element>
402
- <xs:element name="employee" type="ac:Employee"/>
403
- <xs:element name="juridicalAuthorisedRepresentative" type="ac:JuridicalAuthorisedRepresentative"/>
401
+ <xs:element name="employee" type="ac:Employee">
402
+ <xs:annotation>
403
+ <xs:documentation>Персональные данные сотрудника</xs:documentation>
404
+ </xs:annotation>
405
+ </xs:element>
406
+ <xs:element name="juridicalAuthorisedRepresentative" type="ac:JuridicalAuthorisedRepresentative">
407
+ <xs:annotation>
408
+ <xs:documentation>Персональные данные представителя ЮЛ</xs:documentation>
409
+ </xs:annotation>
410
+ </xs:element>
404
411
  <xs:element name="applicantOrganization" type="ac:ApplicantOrganization"/>
405
412
  <xs:element name="employees" type="ac:ListOfRegistrarEmployees">
406
413
  <xs:annotation>