remove code duplication

Author: ScriptRaccoon

scripts/deduce-category-properties.ts

@@ -131,27 +131,30 @@ async function delete_deduced_category_properties(tx: Transaction, category_id:
 	})
 }
 
-async function deduce_satisfied_category_properties(
+async function get_decided_properties(
 	tx: Transaction,
 	category_id: string,
-	implications: NormalizedCategoryImplication[],
-	options: { check_conflicts: boolean } = { check_conflicts: true },
+	value: boolean,
 ) {
-	const satisfied_res = await tx.execute({
+	const res = await tx.execute({
 		sql: `
 			SELECT property_id
 			FROM category_property_assignments
-			WHERE
-				category_id = ?
-				AND is_satisfied = TRUE
-				AND is_deduced = FALSE
+			WHERE category_id = ? AND is_satisfied = ?
 		`,
-		args: [category_id],
+		args: [category_id, value],
 	})
 
-	const satisfied_props = new Set(
-		satisfied_res.rows.map((row) => row.property_id) as string[],
-	) as Set<string>
+	return new Set(res.rows.map((row) => row.property_id) as string[])
+}
+
+async function deduce_satisfied_category_properties(
+	tx: Transaction,
+	category_id: string,
+	implications: NormalizedCategoryImplication[],
+	options: { check_conflicts: boolean } = { check_conflicts: true },
+) {
+	const satisfied_props = await get_decided_properties(tx, category_id, true)
 
 	const deduced_satisfied_props: string[] = []
 	const reasons: Record<string, string> = {}
@@ -211,33 +214,8 @@ async function deduce_unsatisfied_category_properties(
 	implications: NormalizedCategoryImplication[],
 	options: { check_conflicts: boolean } = { check_conflicts: true },
 ) {
-	const satisfied_res = await tx.execute({
-		sql: `
-			SELECT property_id
-			FROM category_property_assignments
-			WHERE category_id = ? AND is_satisfied = TRUE
-		`,
-		args: [category_id],
-	})
-
-	const satisfied_props = new Set(
-		satisfied_res.rows.map((row) => row.property_id) as string[],
-	)
-
-	const unsatisfied_res = await tx.execute({
-		sql: `
-			SELECT property_id
-			FROM category_property_assignments
-			WHERE
-				category_id = ?
-				AND is_satisfied = FALSE
-		`,
-		args: [category_id],
-	})
-
-	const unsatisfied_props = new Set(
-		unsatisfied_res.rows.map((row) => row.property_id) as string[],
-	)
+	const satisfied_props = await get_decided_properties(tx, category_id, true)
+	const unsatisfied_props = await get_decided_properties(tx, category_id, false)
 
 	const deduced_unsatisfied_props: string[] = []
 	const reasons: Record<string, string> = {}

scripts/deduce-functor-properties.ts

@@ -158,26 +158,29 @@ async function delete_deduced_functor_properties(tx: Transaction, functor: Funct
 	})
 }
 
-async function deduce_satisfied_functor_properties(
+async function get_decided_functor_properties(
 	tx: Transaction,
-	functor: FunctorMeta,
-	implications: NormalizedFunctorImplication[],
+	functor_id: string,
+	value: boolean,
 ) {
-	const satisfied_res = await tx.execute({
+	const res = await tx.execute({
 		sql: `
 			SELECT property_id
 			FROM functor_property_assignments
-			WHERE
-				functor_id = ?
-				AND is_satisfied = TRUE
-				AND is_deduced = FALSE
+			WHERE functor_id = ? AND is_satisfied = ?
 		`,
-		args: [functor.id],
+		args: [functor_id, value],
 	})
 
-	const satisfied_props = new Set(
-		satisfied_res.rows.map((row) => row.property_id) as string[],
-	) as Set<string>
+	return new Set(res.rows.map((row) => row.property_id) as string[])
+}
+
+async function deduce_satisfied_functor_properties(
+	tx: Transaction,
+	functor: FunctorMeta,
+	implications: NormalizedFunctorImplication[],
+) {
+	const satisfied_props = await get_decided_functor_properties(tx, functor.id, true)
 
 	const deduced_satisfied_props: string[] = []
 	const reasons: Record<string, string> = {}
@@ -237,34 +240,8 @@ async function deduce_unsatisfied_functor_properties(
 	functor: FunctorMeta,
 	implications: NormalizedFunctorImplication[],
 ) {
-	const satisfied_res = await tx.execute({
-		sql: `
-			SELECT property_id
-			FROM functor_property_assignments
-			WHERE functor_id = ? AND is_satisfied = TRUE
-		`,
-		args: [functor.id],
-	})
-
-	const satisfied_props = new Set(
-		satisfied_res.rows.map((row) => row.property_id) as string[],
-	)
-
-	const unsatisfied_res = await tx.execute({
-		sql: `
-			SELECT property_id
-			FROM functor_property_assignments
-			WHERE
-				functor_id = ?
-				AND is_satisfied = FALSE
-				AND is_deduced = FALSE
-		`,
-		args: [functor.id],
-	})
-
-	const unsatisfied_props = new Set(
-		unsatisfied_res.rows.map((row) => row.property_id) as string[],
-	)
+	const satisfied_props = await get_decided_functor_properties(tx, functor.id, true)
+	const unsatisfied_props = await get_decided_functor_properties(tx, functor.id, false)
 
 	const deduced_unsatisfied_props: string[] = []
 	const reasons: Record<string, string> = {}