Update PR

* Update PR based on testing

Author: abraunegg

src/itemdb.d

@@ -371,7 +371,7 @@ final class ItemDatabase {
 			SELECT *
 			FROM item
 			WHERE type = 'remote'
-			AND remoteDriveId = ?1
+			AND remoteDriveId = ?1 AND remoteId = ?2
 		";
 		selectItemByParentIdStmt = "SELECT * FROM item WHERE driveId = ? AND parentId = ?";
 		deleteItemByIdStmt = "DELETE FROM item WHERE driveId = ? AND id = ?";
@@ -634,12 +634,13 @@ final class ItemDatabase {
 	}
 
 	// This should return the 'remote' DB entry for the given 'remoteDriveId' and 'remoteId'
-	bool selectRemoteTypeByRemoteDriveId(const(char)[] remoteDriveId, out Item item) {
+	bool selectRemoteTypeByRemoteDriveId(const(char)[] remoteDriveId, const(char)[] remoteId, out Item item) {
 		synchronized(databaseLock) {
 			auto p = db.prepare(selectRemoteTypeByRemoteDriveIdStmt);
 			scope(exit) p.finalise(); // Ensure that the prepared statement is finalised after execution.
 			try {
 				p.bind(1, remoteDriveId);
+				p.bind(2, remoteId);
 				auto r = p.exec();
 				if (!r.empty) {
 					item = buildItem(r);

src/onedrive.d

@@ -572,9 +572,19 @@ class OneDriveApi {
 	//   After you have finished receiving all the changes, you may apply them to your local state. To check for changes in the future, call delta again with the @odata.deltaLink from the previous successful response.
 	JSONValue getChangesByItemId(string driveId, string id, string deltaLink) {
 		string[string] requestHeaders;
-		// If Business Account add Prefer: Include-Feature=AddToOneDrive
-		if ((appConfig.accountType != "personal") && ( appConfig.getValueBool("sync_business_shared_items"))) {
-			addIncludeFeatureRequestHeader(&requestHeaders);
+		
+		// From March 1st 2025, this needs to be added to ensure that Shared Folders are sent in the Delta Query Response
+		// TO BE CONFIRMED .. adding 'Include-Feature=AddToOneDrive' to header is NOT WORKING for /delta
+		if (appConfig.accountType == "personal") {
+			// OneDrive Personal Account
+			addIncludeFeatureRequestHeader(&requestHeaders); // NOT WORKING !!!!!!!
+		} else {
+			// Business or SharePoint Library
+			// Only add if configured to do so
+			if (appConfig.getValueBool("sync_business_shared_items")) {
+				// Feature enabled, add headers
+				addIncludeFeatureRequestHeader(&requestHeaders);
+			}
 		}
 
 		string url;
@@ -586,15 +596,26 @@ class OneDriveApi {
 		} else {
 			url = deltaLink;
 		}
+		
+		// get the response
 		return get(url, false, requestHeaders);
 	}
 
 	// https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_list_children
 	JSONValue listChildren(string driveId, string id, string nextLink) {
 		string[string] requestHeaders;
-		// If Business Account add addIncludeFeatureRequestHeader() which should add Prefer: Include-Feature=AddToOneDrive
-		if ((appConfig.accountType != "personal") && ( appConfig.getValueBool("sync_business_shared_items"))) {
+		
+		// From March 1st 2025, this needs to be added to ensure that Shared Folders are sent in the Delta Query Response
+		if (appConfig.accountType == "personal") {
+			// OneDrive Personal Account
 			addIncludeFeatureRequestHeader(&requestHeaders);
+		} else {
+			// Business or SharePoint Library
+			// Only add if configured to do so
+			if (appConfig.getValueBool("sync_business_shared_items")) {
+				// Feature enabled, add headers
+				addIncludeFeatureRequestHeader(&requestHeaders);
+			}
 		}
 
 		string url;
@@ -819,7 +840,14 @@ class OneDriveApi {
 
 	// Private OneDrive API Functions
 	private void addIncludeFeatureRequestHeader(string[string]* headers) {
-		if (debugLogging) {addLogEntry("Adding 'Include-Feature=AddToOneDrive' API request header as 'sync_business_shared_items' config option is enabled", ["debug"]);}
+		if (appConfig.accountType == "personal") {
+			// Add logging message for OneDrive Personal Accounts
+			if (debugLogging) {addLogEntry("Adding 'Include-Feature=AddToOneDrive' API request header for OneDrive Personal Account Type", ["debug"]);}
+		} else {
+			// Add logging message for OneDrive Business Accounts
+			if (debugLogging) {addLogEntry("Adding 'Include-Feature=AddToOneDrive' API request header as 'sync_business_shared_items' config option is enabled", ["debug"]);}
+		}
+		// Add feature to request headers
 		(*headers)["Prefer"] = "Include-Feature=AddToOneDrive";
 	}