@@ -477,9 +477,10 @@ export default class MemberService extends LoggerBase {
477477 }
478478
479479 const key = orgCacheKey ( org )
480+ const cachedOrgPromise = key ? orgPromiseCache ?. get ( key ) : undefined
480481 let orgIdPromise : Promise < string | undefined >
481- if ( key && orgPromiseCache ?. has ( key ) ) {
482- orgIdPromise = orgPromiseCache . get ( key ) !
482+ if ( cachedOrgPromise ) {
483+ orgIdPromise = cachedOrgPromise
483484 } else {
484485 orgIdPromise = logExecutionTimeV2 (
485486 ( ) => orgService . findOrCreate ( platform , integrationId , org ) ,
@@ -713,9 +714,10 @@ export default class MemberService extends LoggerBase {
713714 this . log . trace ( { memberId : id } , 'Finding or creating organization!' )
714715
715716 const key = orgCacheKey ( org )
717+ const cachedOrgPromise = key ? orgPromiseCache ?. get ( key ) : undefined
716718 let orgIdPromise : Promise < string | undefined >
717- if ( key && orgPromiseCache ?. has ( key ) ) {
718- orgIdPromise = orgPromiseCache . get ( key ) !
719+ if ( cachedOrgPromise ) {
720+ orgIdPromise = cachedOrgPromise
719721 } else {
720722 orgIdPromise = logExecutionTimeV2 (
721723 ( ) => orgService . findOrCreate ( platform , integrationId , org ) ,
@@ -843,9 +845,10 @@ export default class MemberService extends LoggerBase {
843845 ] ,
844846 }
845847 const key = orgCacheKey ( org )
848+ const cachedOrgPromise = key ? orgPromiseCache ?. get ( key ) : undefined
846849 let orgIdPromise : Promise < string | undefined >
847- if ( key && orgPromiseCache ?. has ( key ) ) {
848- orgIdPromise = orgPromiseCache . get ( key ) !
850+ if ( cachedOrgPromise ) {
851+ orgIdPromise = cachedOrgPromise
849852 } else {
850853 orgIdPromise = orgService . findOrCreate (
851854 OrganizationAttributeSource . EMAIL ,
0 commit comments