@@ -41,15 +41,15 @@ class DocType(StrEnum):
4141
4242
4343class DocumentRef :
44- def __init__ (self , doc_doc_id : str , doc_doc_ver : str ) -> None :
45- self .doc_doc_id = doc_doc_id
46- self .doc_doc_ver = doc_doc_ver
44+ def __init__ (self , doc_id : str , doc_ver : str ) -> None :
45+ self .doc_id = doc_id
46+ self .doc_ver = doc_ver
4747 self .cid = "0x"
4848
4949 def to_json (self ) -> dict :
5050 return {
51- "id" : self .doc_doc_id ,
52- "ver" : self .doc_doc_ver ,
51+ "id" : self .doc_id ,
52+ "ver" : self .doc_ver ,
5353 "cid" : self .cid ,
5454 }
5555
@@ -137,16 +137,16 @@ def proposal_doc(
137137 proposal_form_template_doc : DocumentRef ,
138138 param_ref : DocumentRef ,
139139 rbac_chain : RBACChain ,
140- doc_doc_id : str | None ,
141- doc_doc_ver : str | None ,
140+ doc_id : str | None = None ,
141+ doc_ver : str | None = None ,
142142) -> SignedDocument :
143143 metadata = __create_metadata (
144144 doc_type = DocType .proposal ,
145145 content_type = "application/json" ,
146146 template = proposal_form_template_doc ,
147147 parameters = [param_ref ],
148- doc_doc_id = doc_doc_id ,
149- doc_doc_ver = doc_doc_ver ,
148+ doc_id = doc_id ,
149+ doc_ver = doc_ver ,
150150 )
151151
152152 (cat_id , key ) = rbac_chain .cat_id_for_role (RoleID .PROPOSER )
@@ -157,8 +157,8 @@ def proposal_form_template_doc(
157157 content : dict [str , Any ],
158158 param_ref : DocumentRef ,
159159 admin_key : AdminKey ,
160- doc_id : str | None ,
161- doc_ver : str | None ,
160+ doc_id : str | None = None ,
161+ doc_ver : str | None = None ,
162162) -> SignedDocument :
163163 metadata = __create_metadata (
164164 doc_type = DocType .proposal_form_template ,
@@ -175,8 +175,8 @@ def proposal_comment_form_template_doc(
175175 content : dict [str , Any ],
176176 param_ref : DocumentRef ,
177177 admin_key : AdminKey ,
178- doc_id : str | None ,
179- doc_ver : str | None ,
178+ doc_id : str | None = None ,
179+ doc_ver : str | None = None ,
180180) -> SignedDocument :
181181 metadata = __create_metadata (
182182 doc_type = DocType .proposal_comment_form_template ,
@@ -194,8 +194,8 @@ def category_parameters_doc(
194194 category_parameters_form_template_doc : DocumentRef ,
195195 param_ref : DocumentRef ,
196196 admin_key : AdminKey ,
197- doc_id : str | None ,
198- doc_ver : str | None ,
197+ doc_id : str | None = None ,
198+ doc_ver : str | None = None ,
199199) -> SignedDocumentBase :
200200 metadata = __create_metadata (
201201 doc_type = DocType .category_parameters ,
@@ -212,8 +212,8 @@ def category_parameters_form_template_doc(
212212 content : dict [str , Any ],
213213 param_ref : DocumentRef ,
214214 admin_key : AdminKey ,
215- doc_id : str | None ,
216- doc_ver : str | None ,
215+ doc_id : str | None = None ,
216+ doc_ver : str | None = None ,
217217) -> SignedDocumentBase :
218218 metadata = __create_metadata (
219219 doc_type = DocType .category_parameters_form_template ,
@@ -230,8 +230,8 @@ def campaign_parameters_doc(
230230 campaign_parameters_form_template_doc : DocumentRef ,
231231 param_ref : DocumentRef ,
232232 admin_key : AdminKey ,
233- doc_id : str | None ,
234- doc_ver : str | None ,
233+ doc_id : str | None = None ,
234+ doc_ver : str | None = None ,
235235) -> SignedDocumentBase :
236236 metadata = __create_metadata (
237237 doc_type = DocType .campaign_parameters ,
@@ -248,8 +248,8 @@ def campaign_parameters_form_template_doc(
248248 content : dict [str , Any ],
249249 param_ref : DocumentRef ,
250250 admin_key : AdminKey ,
251- doc_id : str | None ,
252- doc_ver : str | None ,
251+ doc_id : str | None = None ,
252+ doc_ver : str | None = None ,
253253) -> SignedDocumentBase :
254254 metadata = __create_metadata (
255255 doc_type = DocType .campaign_parameters_form_template ,
@@ -265,8 +265,8 @@ def brand_parameters_doc(
265265 content : dict [str , Any ],
266266 brand_parameters_form_template_ref : DocumentRef ,
267267 admin_key : AdminKey ,
268- doc_id : str | None ,
269- doc_ver : str | None ,
268+ doc_id : str | None = None ,
269+ doc_ver : str | None = None ,
270270) -> SignedDocumentBase :
271271 metadata = __create_metadata (
272272 doc_type = DocType .brand_parameters ,
@@ -281,8 +281,8 @@ def brand_parameters_doc(
281281def brand_parameters_form_template_doc (
282282 content : dict [str , Any ],
283283 admin_key : AdminKey ,
284- doc_id : str | None ,
285- doc_ver : str | None ,
284+ doc_id : str | None = None ,
285+ doc_ver : str | None = None ,
286286) -> SignedDocumentBase :
287287 metadata = __create_metadata (
288288 doc_type = DocType .brand_parameters_form_template ,
@@ -296,11 +296,14 @@ def brand_parameters_form_template_doc(
296296def __create_metadata (
297297 doc_type : DocType ,
298298 content_type : str ,
299- doc_id : str | None ,
300- doc_ver : str | None ,
299+ doc_id : str | None = None ,
300+ doc_ver : str | None = None ,
301301 template : DocumentRef | None = None ,
302302 parameters : list [DocumentRef ] | None = None ,
303303) -> dict [str , Any ]:
304+ if doc_id is None and doc_ver is None :
305+ doc_id = uuid_v7 ()
306+ doc_ver = doc_id
304307 if doc_id is None :
305308 doc_id = uuid_v7 ()
306309 if doc_ver is None :
0 commit comments