feature: reset hashing in database

closes #114

Author: g105b

src/Cli/ExecuteCommand.php

@@ -14,68 +14,102 @@
 
 class ExecuteCommand extends Command {
 	public function run(?ArgumentValueList $arguments = null):void {
-		$forced = $arguments->contains("force");
-
 		$repoBasePath = getcwd();
 		$defaultPath = $this->getDefaultPath($repoBasePath);
-
 		$config = $this->getConfig($repoBasePath, $defaultPath);
 
-		$settings = new Settings(
+		$settings = $this->buildSettingsFromConfig($config, $repoBasePath);
+		[$migrationPath, $migrationTable] = $this->getMigrationLocation($config, $repoBasePath);
+
+		$migrator = new Migrator($settings, $migrationPath, $migrationTable);
+		$migrator->setOutput(
+			$this->stream->getOutStream(),
+			$this->stream->getErrorStream()
+		);
+
+		if($this->isForced($arguments)) {
+			$migrator->deleteAndRecreateSchema();
+		}
+
+		$migrator->selectSchema();
+		$migrator->createMigrationTable();
+		$migrationCount = $migrator->getMigrationCount();
+		$migrationFileList = $migrator->getMigrationFileList();
+
+		$runFrom = $this->calculateResetNumber($arguments, $migrationFileList, $migrator, $migrationCount);
+
+		$this->executeMigrations($migrator, $migrationFileList, $runFrom);
+	}
+
+	/** Determine whether the --force flag was provided. */
+	private function isForced(?ArgumentValueList $arguments):bool {
+		return $arguments?->contains("force") ?? false;
+	}
+
+	/** Build Settings from config for the current repository. */
+	private function buildSettingsFromConfig(\Gt\Config\Config $config, string $repoBasePath): Settings {
+		return new Settings(
 			implode(DIRECTORY_SEPARATOR, [
 				$repoBasePath,
 				$config->get("database.query_path")
 			]),
-
 			$config->get("database.driver") ?? 'mysql',
 			$config->get("database.schema"),
 			$config->get("database.host") ?? "localhost",
 			(int)($config->get("database.port") ?? "3306"),
 			$config->get("database.username"),
 			$config->get("database.password")
 		);
+	}
 
+	/**
+	 * Return [migrationPath, migrationTable] derived from config.
+	 *
+	 * @return list<string>
+	 */
+	private function getMigrationLocation(\Gt\Config\Config $config, string $repoBasePath): array {
 		$migrationPath = implode(DIRECTORY_SEPARATOR, [
 			$repoBasePath,
 			$config->get("database.query_path") ?? "query",
 			$config->get("database.migration_path") ?? "_migration",
 		]);
 		$migrationTable = $config->get("database.migration_table") ?? "_migration";
+		return [$migrationPath, $migrationTable];
+	}
 
-		$migrator = new Migrator($settings, $migrationPath, $migrationTable);
-		$migrator->setOutput(
-			$this->stream->getOutStream(),
-			$this->stream->getErrorStream()
-		);
-
-		if($forced) {
-			$migrator->deleteAndRecreateSchema();
-		}
-
-		$migrator->selectSchema();
-		$migrator->createMigrationTable();
-		$migrationCount = $migrator->getMigrationCount();
-		$migrationFileList = $migrator->getMigrationFileList();
-
-// TODO: Expected functionality is to provide a number to reset like --reset=15, OR leave it blank like --reset
-// If number is provided, ignore everything before this number.
-// If number is not provided, ignore everything other than the latest file in the directory.
+	/**
+	 * Calculate the migration start point from --reset or current migration count.
+	 *
+	 * @param list<string> $migrationFileList
+	 */
+	private function calculateResetNumber(
+		?ArgumentValueList $arguments,
+		array $migrationFileList,
+		Migrator $migrator,
+		int $migrationCount
+	): int {
 		$resetNumber = null;
-		if($arguments->contains("reset")) {
+		if($arguments?->contains("reset")) {
 			$resetNumber = $arguments->get("reset")->get();
 			if(!$resetNumber) {
 				$lastKey = array_key_last($migrationFileList);
 				$lastNumber = $migrator->extractNumberFromFilename($migrationFileList[$lastKey]);
-				// When no number provided, execute only the latest migration by
-				// setting the reset point to one less than the latest number.
 				$resetNumber = max(0, $lastNumber - 1);
 			}
 			$resetNumber = (int)$resetNumber;
 		}
+		return $resetNumber ?? $migrationCount;
+	}
 
+	/**
+	 * Wrap integrity check and perform migration with error handling.
+	 *
+	 * @param list<string> $migrationFileList
+	 */
+	private function executeMigrations(Migrator $migrator, array $migrationFileList, int $runFrom): void {
 		try {
-			$migrator->checkIntegrity($migrationFileList, $resetNumber ?? $migrationCount);
-			$migrator->performMigration($migrationFileList, $resetNumber ?? $migrationCount);
+			$migrator->checkIntegrity($migrationFileList, $runFrom);
+			$migrator->performMigration($migrationFileList, $runFrom);
 		}
 		catch(MigrationIntegrityException $exception) {
 			$this->writeLine(

src/Migration/Migrator.php

@@ -151,8 +151,8 @@ public function checkIntegrity(
 		?int $migrationStartFrom = null
 	):int {
 		$fileNumber = 0;
-
-		foreach($migrationFileList as $i => $file) {
+		
+		foreach($migrationFileList as $file) {
 			$fileNumber = $this->extractNumberFromFilename($file);
 
 			// If a start point is provided, skip files at or before that number
@@ -199,8 +199,8 @@ public function performMigration(
 	):int {
 		$fileNumber = 0;
 		$numCompleted = 0;
-
-		foreach($migrationFileList as $i => $file) {
+		
+		foreach($migrationFileList as $file) {
 			$fileNumber = $this->extractNumberFromFilename($file);
 
 			if($fileNumber <= $existingFileNumber) {