Update enforce statement for parent id database query (Issue #912)

[abraunegg]

• Remove redundant enforce check as if the parent is not in the database, the previous statement ensures the parent is in the database. If the parent is a shared folder, the parent ID will never be in the database as we are never provided it.

[norbusan]

Seems fine to me and understandably, but why was it there in the beginning, and could it have consequences for other usage patterns/combinations so that different failures occur? I.e., if it is not a shared folder, can it still be not in the database?

[abraunegg]

@norbusan
The original code was this:

...
// Perform the database lookup - is the parent in the database?
if (!itemdb.selectByPath(dirName(path), parent.driveId, parent)) {
	// parent is not in the database
	log.vdebug("Parent path is not in the database - need to add it");
	uploadCreateDir(dirName(path));
}
// still enforce check of parent path. if the above was triggered, the below will generate a sync retry and will now be sucessful
enforce(itemdb.selectByPath(dirName(path), parent.driveId, parent), "The parent item id is not in the database");

JSONValue driveItem = [
		"name": JSONValue(baseName(path)),
		"folder": parseJSON("{}")
];
...

The same query is being used above, to check if the parent path is in the database, and if not, then add it.

Now - could leave the enforce in, but do this:

// Perform the database lookup - is the parent in the database?
if (!itemdb.selectByPath(dirName(path), parent.driveId, parent)) {
	// parent is not in the database
	log.vdebug("Parent path is not in the database - need to add it");
	uploadCreateDir(dirName(path));
}
// Is the parent a 'folder' from another user? ie - is this a 'shared folder' that has been shared with us?
if (defaultDriveId == parent.driveId){
	// enforce check of parent path. if the above was triggered, the below will generate a sync retry and will now be sucessful
	enforce(itemdb.selectByPath(dirName(path), parent.driveId, parent), "The parent item id is not in the database");
} else {
	log.vdebug("Parent drive ID is not our drive ID - parent most likely a shared folder");
}

JSONValue driveItem = [
		"name": JSONValue(baseName(path)),
		"folder": parseJSON("{}")
];

This has the same net effect.

[norbusan]

Indeed indeed, that is what I meant. Thanks.

[github-actions]

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.