Skip to content

Commit e51b9ab

Browse files
alainabbasalainabbas
committed
deploy: e8b541c 
1 parent 2834354 commit e51b9ab

File tree

20 files changed

+245
-238
lines changed

20 files changed

+245
-238
lines changed

‎classes/IdentitiesDoublonService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,13 +2676,13 @@ <h3 id="methods">
26762676
identity1.additionalFields.objectClasses.includes(&#x27;supannPerson&#x27;) &amp;&amp;
26772677
identity2.additionalFields.objectClasses.includes(&#x27;supannPerson&#x27;)
26782678
) {
2679-
if (identity2.additionalFields.attributes.supannPerson.includes(&#x27;supannTypeEntiteAffectation&#x27;) ) {
2679+
if (identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation ) {
26802680
identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation.forEach((depN) &#x3D;&gt; {
26812681
(identity1.additionalFields.attributes.supannPerson as any).supannTypeEntiteAffectation.push(depN);
26822682
});
26832683
}
26842684
// supannRefId
2685-
if (identity2.additionalFields.attributes.supannPerson.includes(&#x27;supannRefId&#x27;) ){
2685+
if (identity2.additionalFields.attributes.supannPerson.supannRefId ){
26862686
identity2.additionalFields.attributes.supannPerson.supannRefId.forEach((depN) &#x3D;&gt; {
26872687
(identity1.additionalFields.attributes.supannPerson as any).supannRefId.push(depN);
26882688
});

‎classes/IdentitiesUpsertService.html‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ <h3 id="methods">
509509

510510
<tr>
511511
<td class="col-md-4">
512-
<div class="io-line">Defined in <a href="" data-line="128"
513-
class="link-to-prism">src/management/identities/identities-upsert.service.ts:128</a></div>
512+
<div class="io-line">Defined in <a href="" data-line="135"
513+
class="link-to-prism">src/management/identities/identities-upsert.service.ts:135</a></div>
514514
</td>
515515
</tr>
516516

@@ -2667,6 +2667,13 @@ <h3 id="methods">
26672667
this.logger.log(&#x60;Upserting identity with filters ${JSON.stringify(filters)}&#x60;);
26682668
const crushedUpdate &#x3D; toPlainAndCrush(omit(data || {}, [&#x27;$setOnInsert&#x27;]));
26692669
const crushedSetOnInsert &#x3D; toPlainAndCrush(data.$setOnInsert || {});
2670+
let employeeNumber&#x3D;&quot;&quot;
2671+
if (data?.$setOnInsert.inetOrgPerson.employeeNumber){
2672+
employeeNumber&#x3D;data.$setOnInsert.inetOrgPerson.employeeNumber[0];
2673+
}else{
2674+
employeeNumber&#x3D;data.inetOrgPerson.employeeNumber[0];
2675+
}
2676+
26702677
data &#x3D; construct({
26712678
...crushedSetOnInsert,
26722679
...toPlainAndCrush(identity?.toJSON() || {}, {
@@ -2685,8 +2692,8 @@ <h3 id="methods">
26852692
);
26862693
}
26872694
//controle si l identité est fusionnée si c est la bonne à mettre à jour puisqu elle a 2 employeeNumber
2688-
if (identity !&#x3D;&#x3D; null &amp;&amp; identity?.srcFusionId) {
2689-
if (identity.primaryEmployeeNumber !&#x3D;&#x3D; data?.inetOrgPerson?.employeeNumber[0]) {
2695+
if (identity !&#x3D;&#x3D; null){
2696+
if (identity.primaryEmployeeNumber !&#x3D;&#x3D; null &amp;&amp; identity.primaryEmployeeNumber !&#x3D;&#x3D; employeeNumber) {
26902697
throw new HttpException(&#x27;Secondary identity&#x27;, HttpStatus.SEE_OTHER);
26912698
}
26922699
}

‎injectables/AbstractIdentitiesService.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2664,7 +2664,7 @@ <h3 id="inputs">
26642664
let dataDup &#x3D; 0;
26652665
if (data.inetOrgPerson.hasOwnProperty(&#x27;mail&#x27;) &amp;&amp; data.inetOrgPerson.mail !&#x3D;&#x3D; &#x27;&#x27;) {
26662666
if (identity){
2667-
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id }, &#x27;inetOrgPerson.mail&#x27;: identity.inetOrgPerson.mail };
2667+
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id },&#x27;state&#x27;:{$ne:IdentityState.DONT_SYNC},&#x27;deletedFlag&#x27;:{$ne:true}, &#x27;inetOrgPerson.mail&#x27;: identity.inetOrgPerson.mail };
26682668
dataDup &#x3D; await this._model.countDocuments(f).exec()
26692669
}else{
26702670
const f: any &#x3D; { &#x27;inetOrgPerson.mail&#x27;: data.inetOrgPerson.mail };
@@ -2682,7 +2682,7 @@ <h3 id="inputs">
26822682
protected async checkUid(identity,data): Promise&lt;boolean&gt; {
26832683
let dataDup &#x3D; 0;
26842684
if (identity){
2685-
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id }, &#x27;inetOrgPerson.uid&#x27;: identity.inetOrgPerson.uid };
2685+
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id } ,&#x27;state&#x27;:{$ne:IdentityState.DONT_SYNC},&#x27;deletedFlag&#x27;:{$ne:true},&#x27;inetOrgPerson.uid&#x27;: identity.inetOrgPerson.uid };
26862686
dataDup &#x3D; await this._model.countDocuments(f).exec()
26872687
}else{
26882688
const f: any &#x3D; { &#x27;inetOrgPerson.uid&#x27;: data.inetOrgPerson.uid };

‎js/search/search_index.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/BackendsModule.html‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -119,93 +119,93 @@
119119
</g>
120120
<g id="clust4" class="cluster">
121121
<title>cluster_BackendsModule_exports</title>
122-
<polygon fill="none" stroke="black" points="226,-208 226,-260 358,-260 358,-208 226,-208"/>
123-
</g>
124-
<g id="clust6" class="cluster">
125-
<title>cluster_BackendsModule_providers</title>
126-
<polygon fill="none" stroke="black" points="481,-78 481,-130 653,-130 653,-78 481,-78"/>
122+
<polygon fill="none" stroke="black" points="290,-208 290,-260 422,-260 422,-208 290,-208"/>
127123
</g>
128124
<g id="clust3" class="cluster">
129125
<title>cluster_BackendsModule_imports</title>
130-
<polygon fill="none" stroke="black" points="16,-78 16,-130 473,-130 473,-78 16,-78"/>
126+
<polygon fill="none" stroke="black" points="196,-78 196,-130 653,-130 653,-78 196,-78"/>
127+
</g>
128+
<g id="clust6" class="cluster">
129+
<title>cluster_BackendsModule_providers</title>
130+
<polygon fill="none" stroke="black" points="16,-78 16,-130 188,-130 188,-78 16,-78"/>
131131
</g>
132132
<!-- AgentsModule -->
133133
<g id="node1" class="node">
134134
<title>AgentsModule</title>
135-
<polygon fill="#8dd3c7" stroke="black" points="464.71,-122 461.71,-126 440.71,-126 437.71,-122 365.29,-122 365.29,-86 464.71,-86 464.71,-122"/>
136-
<text text-anchor="middle" x="415" y="-99.8" font-family="Times,serif" font-size="14.00">AgentsModule</text>
135+
<polygon fill="#8dd3c7" stroke="black" points="644.71,-122 641.71,-126 620.71,-126 617.71,-122 545.29,-122 545.29,-86 644.71,-86 644.71,-122"/>
136+
<text text-anchor="middle" x="595" y="-99.8" font-family="Times,serif" font-size="14.00">AgentsModule</text>
137137
</g>
138138
<!-- BackendsModule -->
139139
<g id="node5" class="node">
140140
<title>BackendsModule</title>
141-
<polygon fill="#8dd3c7" stroke="black" points="348.97,-187 345.97,-191 324.97,-191 321.97,-187 235.03,-187 235.03,-151 348.97,-151 348.97,-187"/>
142-
<text text-anchor="middle" x="292" y="-164.8" font-family="Times,serif" font-size="14.00">BackendsModule</text>
141+
<polygon fill="#8dd3c7" stroke="black" points="412.97,-187 409.97,-191 388.97,-191 385.97,-187 299.03,-187 299.03,-151 412.97,-151 412.97,-187"/>
142+
<text text-anchor="middle" x="356" y="-164.8" font-family="Times,serif" font-size="14.00">BackendsModule</text>
143143
</g>
144144
<!-- AgentsModule&#45;&gt;BackendsModule -->
145145
<g id="edge1" class="edge">
146146
<title>AgentsModule&#45;&gt;BackendsModule</title>
147-
<path fill="none" stroke="black" d="M415,-122.02C415,-139.37 415,-163 415,-163 415,-163 359.18,-163 359.18,-163"/>
148-
<polygon fill="black" stroke="black" points="359.18,-159.5 349.18,-163 359.18,-166.5 359.18,-159.5"/>
147+
<path fill="none" stroke="black" d="M595,-122.11C595,-141.34 595,-169 595,-169 595,-169 423.25,-169 423.25,-169"/>
148+
<polygon fill="black" stroke="black" points="423.25,-165.5 413.25,-169 423.25,-172.5 423.25,-165.5"/>
149149
</g>
150150
<!-- IdentitiesModule -->
151151
<g id="node2" class="node">
152152
<title>IdentitiesModule</title>
153-
<polygon fill="#8dd3c7" stroke="black" points="347.65,-122 344.65,-126 323.65,-126 320.65,-122 236.35,-122 236.35,-86 347.65,-86 347.65,-122"/>
154-
<text text-anchor="middle" x="292" y="-99.8" font-family="Times,serif" font-size="14.00">IdentitiesModule</text>
153+
<polygon fill="#8dd3c7" stroke="black" points="527.65,-122 524.65,-126 503.65,-126 500.65,-122 416.35,-122 416.35,-86 527.65,-86 527.65,-122"/>
154+
<text text-anchor="middle" x="472" y="-99.8" font-family="Times,serif" font-size="14.00">IdentitiesModule</text>
155155
</g>
156156
<!-- IdentitiesModule&#45;&gt;BackendsModule -->
157157
<g id="edge2" class="edge">
158158
<title>IdentitiesModule&#45;&gt;BackendsModule</title>
159-
<path fill="none" stroke="black" d="M292,-122.11C292,-122.11 292,-140.99 292,-140.99"/>
160-
<polygon fill="black" stroke="black" points="288.5,-140.99 292,-150.99 295.5,-140.99 288.5,-140.99"/>
159+
<path fill="none" stroke="black" d="M416.27,-104C409.88,-104 405.6,-104 405.6,-104 405.6,-104 405.6,-140.89 405.6,-140.89"/>
160+
<polygon fill="black" stroke="black" points="402.1,-140.89 405.6,-150.89 409.1,-140.89 402.1,-140.89"/>
161161
</g>
162162
<!-- JobsModule -->
163163
<g id="node3" class="node">
164164
<title>JobsModule</title>
165-
<polygon fill="#8dd3c7" stroke="black" points="218.44,-122 215.44,-126 194.44,-126 191.44,-122 133.56,-122 133.56,-86 218.44,-86 218.44,-122"/>
166-
<text text-anchor="middle" x="176" y="-99.8" font-family="Times,serif" font-size="14.00">JobsModule</text>
165+
<polygon fill="#8dd3c7" stroke="black" points="398.44,-122 395.44,-126 374.44,-126 371.44,-122 313.56,-122 313.56,-86 398.44,-86 398.44,-122"/>
166+
<text text-anchor="middle" x="356" y="-99.8" font-family="Times,serif" font-size="14.00">JobsModule</text>
167167
</g>
168168
<!-- JobsModule&#45;&gt;BackendsModule -->
169169
<g id="edge3" class="edge">
170170
<title>JobsModule&#45;&gt;BackendsModule</title>
171-
<path fill="none" stroke="black" d="M176,-122.02C176,-139.37 176,-163 176,-163 176,-163 225.02,-163 225.02,-163"/>
172-
<polygon fill="black" stroke="black" points="225.02,-166.5 235.02,-163 225.02,-159.5 225.02,-166.5"/>
171+
<path fill="none" stroke="black" d="M356,-122.11C356,-122.11 356,-140.99 356,-140.99"/>
172+
<polygon fill="black" stroke="black" points="352.5,-140.99 356,-150.99 359.5,-140.99 352.5,-140.99"/>
173173
</g>
174174
<!-- TasksModule -->
175175
<g id="node4" class="node">
176176
<title>TasksModule</title>
177-
<polygon fill="#8dd3c7" stroke="black" points="116.21,-122 113.21,-126 92.21,-126 89.21,-122 23.79,-122 23.79,-86 116.21,-86 116.21,-122"/>
178-
<text text-anchor="middle" x="70" y="-99.8" font-family="Times,serif" font-size="14.00">TasksModule</text>
177+
<polygon fill="#8dd3c7" stroke="black" points="296.21,-122 293.21,-126 272.21,-126 269.21,-122 203.79,-122 203.79,-86 296.21,-86 296.21,-122"/>
178+
<text text-anchor="middle" x="250" y="-99.8" font-family="Times,serif" font-size="14.00">TasksModule</text>
179179
</g>
180180
<!-- TasksModule&#45;&gt;BackendsModule -->
181181
<g id="edge4" class="edge">
182182
<title>TasksModule&#45;&gt;BackendsModule</title>
183-
<path fill="none" stroke="black" d="M70,-122.28C70,-143.32 70,-175 70,-175 70,-175 224.83,-175 224.83,-175"/>
184-
<polygon fill="black" stroke="black" points="224.83,-178.5 234.83,-175 224.83,-171.5 224.83,-178.5"/>
183+
<path fill="none" stroke="black" d="M296.31,-104C302.3,-104 306.4,-104 306.4,-104 306.4,-104 306.4,-140.89 306.4,-140.89"/>
184+
<polygon fill="black" stroke="black" points="302.9,-140.89 306.4,-150.89 309.9,-140.89 302.9,-140.89"/>
185185
</g>
186186
<!-- BackendsService -->
187187
<g id="node6" class="node">
188188
<title>BackendsService </title>
189-
<polygon fill="#fb8072" stroke="black" points="349.9,-252 234.1,-252 234.1,-216 349.9,-216 349.9,-252"/>
190-
<text text-anchor="middle" x="292" y="-229.8" font-family="Times,serif" font-size="14.00">BackendsService </text>
189+
<polygon fill="#fb8072" stroke="black" points="413.9,-252 298.1,-252 298.1,-216 413.9,-216 413.9,-252"/>
190+
<text text-anchor="middle" x="356" y="-229.8" font-family="Times,serif" font-size="14.00">BackendsService </text>
191191
</g>
192192
<!-- BackendsModule&#45;&gt;BackendsService -->
193193
<g id="edge5" class="edge">
194194
<title>BackendsModule&#45;&gt;BackendsService </title>
195-
<path fill="none" stroke="black" stroke-dasharray="5,2" d="M292,-187.11C292,-187.11 292,-205.99 292,-205.99"/>
196-
<polygon fill="black" stroke="black" points="288.5,-205.99 292,-215.99 295.5,-205.99 288.5,-205.99"/>
195+
<path fill="none" stroke="black" stroke-dasharray="5,2" d="M356,-187.11C356,-187.11 356,-205.99 356,-205.99"/>
196+
<polygon fill="black" stroke="black" points="352.5,-205.99 356,-215.99 359.5,-205.99 352.5,-205.99"/>
197197
</g>
198198
<!-- BackendsService -->
199199
<g id="node7" class="node">
200200
<title>BackendsService</title>
201-
<ellipse fill="#fdb462" stroke="black" cx="567" cy="-104" rx="77.57" ry="18"/>
202-
<text text-anchor="middle" x="567" y="-99.8" font-family="Times,serif" font-size="14.00">BackendsService</text>
201+
<ellipse fill="#fdb462" stroke="black" cx="102" cy="-104" rx="77.57" ry="18"/>
202+
<text text-anchor="middle" x="102" y="-99.8" font-family="Times,serif" font-size="14.00">BackendsService</text>
203203
</g>
204204
<!-- BackendsService&#45;&gt;BackendsModule -->
205205
<g id="edge6" class="edge">
206206
<title>BackendsService&#45;&gt;BackendsModule</title>
207-
<path fill="none" stroke="black" d="M567,-122.28C567,-143.32 567,-175 567,-175 567,-175 358.98,-175 358.98,-175"/>
208-
<polygon fill="black" stroke="black" points="358.98,-171.5 348.98,-175 358.98,-178.5 358.98,-171.5"/>
207+
<path fill="none" stroke="black" d="M102,-122.11C102,-141.34 102,-169 102,-169 102,-169 289,-169 289,-169"/>
208+
<polygon fill="black" stroke="black" points="289,-172.5 299,-169 289,-165.5 289,-172.5"/>
209209
</g>
210210
</g>
211211
</svg>

0 commit comments

Comments
 (0)