feat: refactor Notion database querying methods

- Add a new method `QueryContainsDatabase` to query the Notion database by property and value
- Move the `notionapi.NewClient` initialization to a separate variable `client`
- Modify the `QueryContainsDatabase` method to add the `UId` to the filter conditions
- Add a new method `QueryDatabaseContainsByName` to query the Notion database by name and UId
- Add a new method `QueryDatabaseContainsByEmail` to query the Notion database by email and UId
- Add a new method `QueryDatabaseContainsByTitle` to query the Notion database by title and UId
- Add a new method `QueryDatabaseContains` to query the Notion database by name, email, and title

Signed-off-by: Evan Lin <[email protected]>

notion.go

@@ -60,6 +60,44 @@ func (n *NotionDB) QueryDatabase(UId, property, value string) ([]Person, error)
 	return entries, nil
 }
 
+// QueryContainsDatabase 根據提供的屬性和值查詢 Notion 資料庫。
+func (n *NotionDB) QueryContainsDatabase(UId, property, value string) ([]Person, error) {
+	client := notionapi.NewClient(notionapi.Token(n.Token))
+
+	// Add UId to the filter conditions
+	// 建立查詢過濾條件
+	filter := &notionapi.DatabaseQueryRequest{
+		Filter: notionapi.AndCompoundFilter{
+			notionapi.PropertyFilter{
+				Property: property,
+				RichText: &notionapi.TextFilterCondition{
+					Contains: value,
+				},
+			},
+			notionapi.PropertyFilter{
+				Property: "UID",
+				RichText: &notionapi.TextFilterCondition{
+					Equals: UId,
+				},
+			},
+		},
+	}
+
+	// 調用 Notion API 來查詢資料庫
+	result, err := client.Database.Query(context.Background(), notionapi.DatabaseID(n.DatabaseID), filter)
+	if err != nil {
+		return nil, err
+	}
+
+	var entries []Person
+
+	for _, page := range result.Results {
+		entry := n.createEntryFromPage(&page)
+		entries = append(entries, entry)
+	}
+	return entries, nil
+}
+
 // QueryDatabaseByEmail 根據提供的電子郵件地址和UId查詢 Notion 資料庫。
 func (n *NotionDB) QueryDatabaseByEmail(email, UId string) ([]Person, error) {
 	return n.QueryDatabase(UId, "Email", email)
@@ -166,3 +204,48 @@ func (n *NotionDB) getPropertyValue(page *notionapi.Page, property string) strin
 func (n *NotionDB) QueryDatabaseByName(name, UId string) ([]Person, error) {
 	return n.QueryDatabase(UId, "Name", name)
 }
+
+// QueryDatabaseContainsByName 根據提供的名稱和UId查詢 Notion 資料庫。
+func (n *NotionDB) QueryDatabaseContainsByName(name, UId string) ([]Person, error) {
+	return n.QueryContainsDatabase(UId, "Name", name)
+}
+
+// QueryDatabaseContainsByEmail 根據提供的名稱和UId查詢 Notion 資料庫。
+func (n *NotionDB) QueryDatabaseContainsByEmail(name, UId string) ([]Person, error) {
+	return n.QueryContainsDatabase(UId, "Email", name)
+}
+
+// QueryDatabaseContainsByName 根據提供的名稱和UId查詢 Notion 資料庫。
+func (n *NotionDB) QueryDatabaseContainsByTitle(name, UId string) ([]Person, error) {
+	return n.QueryContainsDatabase(UId, "Title", name)
+}
+
+// QueryDatabaseContains 根據提供的名稱和UId查詢 Notion 資料庫。
+func (n *NotionDB) QueryDatabaseContains(query, UId string) ([]Person, error) {
+	// 初始化一個空的結果集
+	var combinedResult []Person
+
+	// 進行名稱查詢
+	nameResult, err := n.QueryDatabaseContainsByName(query, UId)
+	if err != nil {
+		return nil, err
+	}
+	combinedResult = append(combinedResult, nameResult...)
+
+	// 進行電子郵件查詢
+	emailResult, err := n.QueryDatabaseContainsByEmail(query, UId)
+	if err != nil {
+		return nil, err
+	}
+	combinedResult = append(combinedResult, emailResult...)
+
+	// 進行標題查詢
+	titleResult, err := n.QueryDatabaseContainsByTitle(query, UId)
+	if err != nil {
+		return nil, err
+	}
+	combinedResult = append(combinedResult, titleResult...)
+
+	// 返回結合的結果
+	return combinedResult, nil
+}

notion_test.go

@@ -53,3 +53,39 @@ func TestAddNotionDB(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestQueryContainNotionDB(t *testing.T) {
+	token := os.Getenv("NOTION_INTEGRATION_TOKEN")
+	pageid := os.Getenv("NOTION_DB_PAGEID")
+
+	// If not set token and pageid , skip this test
+	if token == "" || pageid == "" {
+		t.Skip("NOTION_INTEGRATION_TOKEN or NOTION_DB_PAGEID not set")
+	}
+
+	db := &NotionDB{
+		DatabaseID: pageid,
+		Token:      token,
+	}
+
+	entries, err := db.QueryDatabaseContainsByName("name", "uid")
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("%+v\n", entries)
+
+	entries, err = db.QueryDatabaseContainsByEmail("email", "uid")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fmt.Printf("%+v\n", entries)
+
+	//test contains all columns (name, title, email)
+	entries, err = db.QueryDatabaseContains("keyword", "uid")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fmt.Printf("%+v\n", entries)
+}