メールフィールド一覧取得APIを調整 (#2278)

Co-authored-by: ryuring <egashira@catchup.co.jp>
baserproject · Apr 16, 2023 · d80137b · d80137b
1 parent 6bdafd9
commit d80137b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/plugins/bc-mail/src/Service/MailFieldsService.php b/plugins/bc-mail/src/Service/MailFieldsService.php
@@ -96,7 +96,13 @@ public function getIndex(int $mailContentId, array $queryParams = [])
             $query->limit($queryParams['limit']);
         }
 
+        $fields = $this->MailFields->getSchema()->columns();
         if ($options['status'] === 'publish') {
+            if (empty($queryParams['contain'])) {
+                $query->contain(['MailContents' => ['Contents']])->select($fields);
+            } elseif (!isset($queryParams['contain']['MailContents']['Contents'])) {
+                $query->contain(array_merge_recursive($query->getContain(), ['MailContents' => ['Contents']]));
+            }
             $conditions['use_field'] = true;
             $conditions = array_merge($conditions, $this->MailFields->MailContents->Contents->getConditionAllowPublish());
         }