Skip to content

Commit 1942525

Browse files
invisig0thinvisig0th
committed
Convert to entity:actor
1 parent 69e5223 commit 1942525

20 files changed

+612
-682
lines changed

‎synapse/models/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
'disp': {'hint': 'text', 'syntax': 'markdown'},
218218
'doc': 'The analyst authored note text.'}),
219219

220-
('author', ('ps:contact', {}), {
220+
('author', ('entity:actor', {}), {
221221
'doc': 'The contact information of the author.'}),
222222

223223
('creator', ('syn:user', {}), {
@@ -285,7 +285,7 @@
285285
('desc', ('str', {}), {
286286
'disp': {'hint': 'text'},
287287
'doc': 'A description of the ruleset.'}),
288-
('author', ('ps:contact', {}), {
288+
('author', ('entity:actor', {}), {
289289
'doc': 'The contact information of the ruleset author.'}),
290290
('created', ('time', {}), {
291291
'doc': 'The time the ruleset was initially created.'}),
@@ -305,7 +305,7 @@
305305
('text', ('str', {}), {
306306
'disp': {'hint': 'text'},
307307
'doc': 'The text of the rule logic.'}),
308-
('author', ('ps:contact', {}), {
308+
('author', ('entity:actor', {}), {
309309
'doc': 'The contact information of the rule author.'}),
310310
('created', ('time', {}), {
311311
'doc': 'The time the rule was initially created.'}),

‎synapse/models/belief.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
('belief:subscriber', {}, (
5050

51-
('contact', ('ps:contact', {}), {
51+
('contact', ('entity:actor', {}), {
5252
'doc': 'The contact which subscribes to the belief system.'}),
5353

5454
('system', ('belief:system', {}), {

‎synapse/models/biz.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
('propdue', ('time', {}), {
8484
'doc': 'The date/time that proposals are due.',
8585
}),
86-
('contact', ('ps:contact', {}), {
86+
('contact', ('entity:actor', {}), {
8787
'doc': 'The contact information given for the org requesting offers.',
8888
}),
8989
('purchases', ('array', {'type': 'econ:purchase', 'uniq': True, 'sorted': True}), {
@@ -114,26 +114,26 @@
114114
('rfp', ('biz:rfp', {}), {
115115
'doc': 'The RFP that the deal is in response to.',
116116
}),
117-
('buyer', ('ps:contact', {}), {
117+
('buyer', ('entity:actor', {}), {
118118
'doc': 'The primary contact information for the buyer.',
119119
}),
120120
('buyer:org', ('ou:org', {}), {
121121
'doc': 'The buyer org.',
122122
}),
123-
('buyer:orgname', ('ou:name', {}), {
124-
'doc': 'The reported ou:name of the buyer org.',
123+
('buyer:orgname', ('entity:name', {}), {
124+
'doc': 'The reported name of the buyer org.',
125125
}),
126126
('buyer:orgfqdn', ('inet:fqdn', {}), {
127127
'doc': 'The reported inet:fqdn of the buyer org.',
128128
}),
129-
('seller', ('ps:contact', {}), {
129+
('seller', ('entity:actor', {}), {
130130
'doc': 'The primary contact information for the seller.',
131131
}),
132132
('seller:org', ('ou:org', {}), {
133133
'doc': 'The seller org.',
134134
}),
135-
('seller:orgname', ('ou:name', {}), {
136-
'doc': 'The reported ou:name of the seller org.',
135+
('seller:orgname', ('entity:name', {}), {
136+
'doc': 'The reported name of the seller org.',
137137
}),
138138
('seller:orgfqdn', ('inet:fqdn', {}), {
139139
'doc': 'The reported inet:fqdn of the seller org.',
@@ -173,7 +173,7 @@
173173
)),
174174
('biz:listing', {}, (
175175

176-
('seller', ('ps:contact', {}), {
176+
('seller', ('entity:actor', {}), {
177177
'doc': 'The contact information for the seller.'}),
178178

179179
('product', ('biz:product', {}), {
@@ -204,7 +204,7 @@
204204
'doc': 'The current remaining number of instances for sale.'}),
205205
)),
206206
('biz:service', {}, (
207-
('provider', ('ps:contact', {}), {
207+
('provider', ('entity:actor', {}), {
208208
'doc': 'The contact info of the entity which performs the service.'}),
209209
('name', ('str', {'lower': True, 'onespace': True}), {
210210
'doc': 'The name of the service being performed.'}),
@@ -229,7 +229,8 @@
229229
'doc': 'A brief summary of the product.',
230230
'disp': {'hint': 'text'},
231231
}),
232-
('maker', ('ps:contact', {}), {
232+
# FIXME: manufactur?
233+
('maker', ('entity:actor', {}), {
233234
'doc': 'A contact for the maker of the product.',
234235
}),
235236
('price:retail', ('econ:price', {}), {
@@ -252,17 +253,19 @@
252253
('org', ('ou:org', {}), {
253254
'doc': 'The resolved org.',
254255
}),
255-
('orgname', ('ou:name', {}), {
256-
'doc': 'The org name as reported by the source of the vitals.',
256+
('org:name', ('entity:name', {}), {
257+
'prevnames': ('orgname',),
258+
'doc': 'The org name as reported by the source of the stake.',
257259
}),
258-
('orgfqdn', ('inet:fqdn', {}), {
259-
'doc': 'The org FQDN as reported by the source of the vitals.',
260+
('org:fqdn', ('inet:fqdn', {}), {
261+
'doc': 'The org FQDN as reported by the source of the stake.',
260262
}),
261263
('name', ('str', {}), {
262264
'doc': 'An arbitrary name for this stake. Can be non-contact like "pool".',
263265
}),
266+
# FIXME asof -> updated ( in general? )
264267
('asof', ('time', {}), {
265-
'doc': 'The time the stake is being measured. Likely as part of an ou:vitals.',
268+
'doc': 'The time the stake is being measured.',
266269
}),
267270
('shares', ('int', {}), {
268271
'doc': 'The number of shares represented by the stake.',
@@ -276,7 +279,7 @@
276279
('percent', ('hugenum', {}), {
277280
'doc': 'The percentage ownership represented by this stake.',
278281
}),
279-
('owner', ('ps:contact', {}), {
282+
('owner', ('entity:actor', {}), {
280283
'doc': 'Contact information of the owner of the stake.',
281284
}),
282285
('purchase', ('econ:purchase', {}), {

‎synapse/models/dns.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,14 @@ def _normPyStr(self, valu):
307307
('provider', ('ou:org', {}), {
308308
'doc': 'The organization which provides the dynamic DNS FQDN.'}),
309309

310-
('provider:name', ('ou:name', {}), {
310+
('provider:name', ('entity:name', {}), {
311311
'doc': 'The name of the organization which provides the dynamic DNS FQDN.'}),
312312

313313
('provider:fqdn', ('inet:fqdn', {}), {
314314
'doc': 'The FQDN of the organization which provides the dynamic DNS FQDN.'}),
315315

316-
('contact', ('ps:contact', {}), {
316+
# FIXME inet:service:account?
317+
('contact', ('entity:contact', {}), {
317318
'doc': 'The contact information of the registrant.'}),
318319

319320
('created', ('time', {}), {

‎synapse/models/doc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
('updated', ('time', {}), {
3636
'doc': 'The time that the {document} was last updated.'}),
3737

38-
('author', ('ps:contact', {}), {
38+
('author', ('entity:contact', {}), {
3939
'doc': 'The contact information of the primary author.'}),
4040

41-
('contributors', ('array', {'type': 'ps:contact', 'sorted': True, 'uniq': True}), {
41+
('contributors', ('array', {'type': 'entity:contact', 'sorted': True, 'uniq': True}), {
4242
'doc': 'An array of contacts which contributed to the {document}.'}),
4343

4444
('version', ('it:semver', {}), {
@@ -130,7 +130,7 @@
130130
('doc:resume:type:taxonomy', {}, ()),
131131
('doc:resume', {}, (
132132

133-
('contact', ('ps:contact', {}), {
133+
('contact', ('entity:individual', {}), {
134134
'doc': 'Contact information for subject of the resume.'}),
135135

136136
('summary', ('str', {}), {

‎synapse/models/economic.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109

110110
'props': (
111111

112-
('contact', ('ps:contact', {}), {
112+
('contact', ('entity:actor', {}), {
113113
'doc': 'The primary contact for the {instrument}.'}),
114114
),
115115
}),
@@ -146,7 +146,7 @@
146146
('pan:iin', ('econ:pay:iin', {}), {
147147
'doc': 'The payment card IIN.'}),
148148

149-
('name', ('ps:name', {}), {
149+
('name', ('entity:name', {}), {
150150
'doc': 'The name as it appears on the card.'}),
151151

152152
('expr', ('time', {}), {
@@ -164,10 +164,10 @@
164164

165165
('econ:purchase', {}, (
166166

167-
('by:contact', ('ps:contact', {}), {
167+
('by:contact', ('entity:actor', {}), {
168168
'doc': 'The contact information used to make the purchase.'}),
169169

170-
('from:contact', ('ps:contact', {}), {
170+
('from:contact', ('entity:actor', {}), {
171171
'doc': 'The contact information used to sell the item.'}),
172172

173173
('time', ('time', {}), {
@@ -233,13 +233,13 @@
233233
('from:contract', ('ou:contract', {}), {
234234
'doc': 'A contract used as an aggregate payment source.'}),
235235

236-
('from:contact', ('ps:contact', {}), {
236+
('from:contact', ('entity:actor', {}), {
237237
'doc': 'Contact information for the entity making the payment.'}),
238238

239239
('to:cash', ('bool', {}), {
240240
'doc': 'Set to true if the payment output was in cash.'}),
241241

242-
('to:contact', ('ps:contact', {}), {
242+
('to:contact', ('entity:actor', {}), {
243243
'doc': 'Contact information for the person/org being paid.'}),
244244

245245
('to:contract', ('ou:contract', {}), {
@@ -376,13 +376,13 @@
376376
('issued', ('time', {}), {
377377
'doc': 'The time that the invoice was issued to the recipient.'}),
378378

379-
('issuer', ('ps:contact', {}), {
379+
('issuer', ('entity:actor', {}), {
380380
'doc': 'The contact information for the entity who issued the invoice.'}),
381381

382382
('purchase', ('econ:purchase', {}), {
383383
'doc': 'The purchase that the invoice is requesting payment for.'}),
384384

385-
('recipient', ('ps:contact', {}), {
385+
('recipient', ('entity:actor', {}), {
386386
'doc': 'The contact information for the intended recipient of the invoice.'}),
387387

388388
('due', ('time', {}), {
@@ -406,10 +406,10 @@
406406
('purchase', ('econ:purchase', {}), {
407407
'doc': 'The purchase that the receipt confirms payment for.'}),
408408

409-
('issuer', ('ps:contact', {}), {
409+
('issuer', ('entity:actor', {}), {
410410
'doc': 'The contact information for the entity who issued the receipt.'}),
411411

412-
('recipient', ('ps:contact', {}), {
412+
('recipient', ('entity:actor', {}), {
413413
'doc': 'The contact information for the entity who received the receipt.'}),
414414

415415
('currency', ('econ:currency', {}), {
@@ -424,7 +424,7 @@
424424
('bank', ('ou:org', {}), {
425425
'doc': 'The bank which was issued the ABA RTN.'}),
426426

427-
('bank:name', ('ou:name', {}), {
427+
('bank:name', ('entity:name', {}), {
428428
'doc': 'The name which is registered for this ABA RTN.'}),
429429

430430
)),
@@ -436,7 +436,8 @@
436436
('business', ('ou:org', {}), {
437437
'doc': 'The business which is the registered owner of the SWIFT BIC.'}),
438438

439-
('office', ('ps:contact', {}), {
439+
# FIXME ou:office?
440+
('office', ('entity:actor', {}), {
440441
'doc': 'The branch or office which is specified in the last 3 digits of the SWIFT BIC.'}),
441442
)),
442443

@@ -458,7 +459,7 @@
458459
('issuer', ('ou:org', {}), {
459460
'doc': 'The bank which issued the account.'}),
460461

461-
('issuer:name', ('ou:name', {}), {
462+
('issuer:name', ('entity:name', {}), {
462463
'doc': 'The name of the bank which issued the account.'}),
463464

464465
('currency', ('econ:currency', {}), {

0 commit comments

Comments
 (0)