Merge branch 'dev' into l10n_dev

weareinreach · Feb 20, 2024 · 5e59ff0 · 5e59ff0
2 parents c67d658 + a697ca8
commit 5e59ff0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git a/packages/api/router/orgEmail/query.forContactInfo.handler.ts b/packages/api/router/orgEmail/query.forContactInfo.handler.ts
@@ -8,14 +8,15 @@ const isPublic = globalWhere.isPublic()
 const whereId = (input: TForContactInfoSchema, isSingleLoc?: boolean): Prisma.OrgEmailWhereInput => {
 	switch (true) {
 		case isIdFor('organization', input.parentId): {
-			return isSingleLoc
-				? {
-						OR: [
-							{ organization: { some: { organization: { id: input.parentId, ...isPublic } } } },
-							{ locations: { some: { location: { organization: { id: input.parentId, ...isPublic } } } } },
-						],
-					}
-				: { organization: { some: { organization: { id: input.parentId, ...isPublic } } } }
+			return { organization: { some: { organization: { id: input.parentId, ...isPublic } } } }
+			// return isSingleLoc
+			// 	? {
+			// 			OR: [
+			// 				{ organization: { some: { organization: { id: input.parentId, ...isPublic } } } },
+			// 				{ locations: { some: { location: { organization: { id: input.parentId, ...isPublic } } } } },
+			// 			],
+			// 		}
+			// 	: { organization: { some: { organization: { id: input.parentId, ...isPublic } } } }
 		}
 		case isIdFor('orgLocation', input.parentId): {
 			return { locations: { some: { location: { id: input.parentId, ...isPublic } } } }

diff --git a/packages/api/router/orgPhone/query.forContactInfo.handler.ts b/packages/api/router/orgPhone/query.forContactInfo.handler.ts
@@ -8,14 +8,15 @@ const isPublic = globalWhere.isPublic()
 const getWhereId = (input: TForContactInfoSchema, isSingleLoc?: boolean): Prisma.OrgPhoneWhereInput => {
 	switch (true) {
 		case isIdFor('organization', input.parentId): {
-			return isSingleLoc
-				? { organization: { organization: { id: input.parentId, ...isPublic } } }
-				: {
-						OR: [
-							{ organization: { organization: { id: input.parentId, ...isPublic } } },
-							{ locations: { some: { location: { organization: { id: input.parentId, ...isPublic } } } } },
-						],
-					}
+			return { organization: { organization: { id: input.parentId, ...isPublic } } }
+			// return isSingleLoc
+			// 	? { organization: { organization: { id: input.parentId, ...isPublic } } }
+			// 	: {
+			// 			OR: [
+			// 				{ organization: { organization: { id: input.parentId, ...isPublic } } },
+			// 				{ locations: { some: { location: { organization: { id: input.parentId, ...isPublic } } } } },
+			// 			],
+			// 		}
 		}
 		case isIdFor('orgLocation', input.parentId): {
 			return { locations: { some: { location: { id: input.parentId, ...isPublic } } } }

diff --git a/packages/api/router/orgSocialMedia/query.forContactInfo.handler.ts b/packages/api/router/orgSocialMedia/query.forContactInfo.handler.ts
@@ -8,14 +8,15 @@ const isPublic = globalWhere.isPublic()
 const whereId = (input: TForContactInfoSchema, isSingleLoc?: boolean): Prisma.OrgSocialMediaWhereInput => {
 	switch (true) {
 		case isIdFor('organization', input.parentId): {
-			return isSingleLoc
-				? { organization: { id: input.parentId, ...isPublic } }
-				: {
-						OR: [
-							{ organization: { id: input.parentId, ...isPublic } },
-							{ locations: { every: { location: { organization: { id: input.parentId, ...isPublic } } } } },
-						],
-					}
+			return { organization: { id: input.parentId, ...isPublic } }
+			// return isSingleLoc
+			// 	? { organization: { id: input.parentId, ...isPublic } }
+			// 	: {
+			// 			OR: [
+			// 				{ organization: { id: input.parentId, ...isPublic } },
+			// 				{ locations: { every: { location: { organization: { id: input.parentId, ...isPublic } } } } },
+			// 			],
+			// 		}
 		}
 		case isIdFor('orgLocation', input.parentId): {
 			return { locations: { some: { location: { id: input.parentId, ...isPublic } } } }

diff --git a/packages/api/router/orgWebsite/query.forContactInfo.handler.ts b/packages/api/router/orgWebsite/query.forContactInfo.handler.ts
@@ -9,14 +9,15 @@ const isPublic = globalWhere.isPublic()
 const whereId = (input: TForContactInfoSchema, isSingleLoc?: boolean): Prisma.OrgWebsiteWhereInput => {
 	switch (true) {
 		case isIdFor('organization', input.parentId): {
-			return isSingleLoc
-				? { organization: { id: input.parentId, ...isPublic } }
-				: {
-						OR: [
-							{ organization: { id: input.parentId, ...isPublic } },
-							{ locations: { every: { location: { organization: { id: input.parentId, ...isPublic } } } } },
-						],
-					}
+			return { organization: { id: input.parentId, ...isPublic } }
+			// return isSingleLoc
+			// 	? { organization: { id: input.parentId, ...isPublic } }
+			// 	: {
+			// 			OR: [
+			// 				{ organization: { id: input.parentId, ...isPublic } },
+			// 				{ locations: { every: { location: { organization: { id: input.parentId, ...isPublic } } } } },
+			// 			],
+			// 		}
 		}
 		case isIdFor('orgLocation', input.parentId): {
 			return { locations: { every: { location: { id: input.parentId, ...isPublic } } } }