threaded update post relationships

main.go

@@ -7,15 +7,15 @@ import (
 )
 
 // WP Config
-const baseUrl = "http://go-api-playground.local/"
+const baseUrl = "https://slowtwitch.cloud/"
-const wordpressKey = "admin"
+const wordpressKey = "admin@slowtwitch.cloud"
-const wordpressSecret = "7ZeY ZCwp 3DwL EBAK vGtf NW9J"
+const wordpressSecret = "3SrI MysB NREZ 40OD PLAP uk1W"
 
 // DB Config
 const slowtwitchAdminUser = "admin"
 const slowtwitchAdminPass = "yxnh93Ybbz2Nm8#mp28zCVv"
 const slowtwitchDbName = "slowtwitch"
-const migrationDbName = "slowtwitch_transfer_threaded_test"
+const migrationDbName = "slowtwitch_transfer"
 const federatedDbUrl = "slowtwitch.northend.network"
 const federatedDbPort = "3306"
 

services/migration/editor-result.go

@@ -18,8 +18,8 @@ func CreateEditorResult(result EditorResult, db *sql.DB) error {
 	return err
 }
 
-func GetEditor(username string, db *sql.DB) (EditorResult, error) {
+func GetEditor(username, email string, db *sql.DB) (EditorResult, error) {
-	rows, err := db.Query("select WordpressId, Username, Email, (IsSuccess = b'1') from EditorsResults where Username = ?", username)
+	rows, err := db.Query("select WordpressId, Username, Email, (IsSuccess = b'1') from EditorsResults where Username = ? OR Email = ?", username, email)
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -35,7 +35,7 @@ func GetEditor(username string, db *sql.DB) (EditorResult, error) {
 			fmt.Println(err)
 		}
 
-		if editor.Username == username {
+		if editor.Username == username || editor.Email == email {
 			return editor, nil
 		}
 	}
@@ -43,8 +43,8 @@ func GetEditor(username string, db *sql.DB) (EditorResult, error) {
 	return EditorResult{}, errors.New("Could not find editor.")
 }
 
-func EditorHasBeenMigrated(username string, db *sql.DB) bool {
+func EditorHasBeenMigrated(username, email string, db *sql.DB) bool {
-	_, err := GetEditor(username, db)
+	_, err := GetEditor(username, email, db)
 
 	if err == nil {
 		return true

services/migration/migrate-authors.go

@@ -22,7 +22,7 @@ func (migration *MigrateAuthors) Execute() []EditorResult {
 	var output []EditorResult
 
 	for _, editor := range editors {
-		hasBeenMigrated := EditorHasBeenMigrated(editor.Username, migration.ResultsDatabase)
+		hasBeenMigrated := EditorHasBeenMigrated(editor.Username, editor.Email, migration.ResultsDatabase)
 
 		if hasBeenMigrated == false {
 			firstName, lastName := getFirstAndLastName(editor.Name)

services/migration/migrate-posts.go

@@ -8,6 +8,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"sync"
 )
 
 type MigratePosts struct {
@@ -114,15 +115,20 @@ func (migration MigratePosts) Execute() []PostResult {
 
 					createWordpressPost.Categories = wordPressCategoryIds
 					//Get Author ID
-					editor, findEditorErr := GetEditor(postBase.Author, migration.ResultsDatabase)
+					editor, findEditorErr := GetEditor(postBase.Author, postBase.AuthorEmail, migration.ResultsDatabase)
 
 					if findEditorErr != nil {
+						editor, catchAllEditorErr := GetEditor("admin", "slowman2@slowtwitch.com", migration.ResultsDatabase)
+
+						if catchAllEditorErr != nil {
 							errorMessage = errorMessage + findEditorErr.Error()
 							failedPostResult := createPostFailureResult(batchId, errorMessage, migration.ResultsDatabase)
 							postResultsChannel <- failedPostResult
 							return
 						}
 						createWordpressPost.Author = editor.WordpressId
+					}
+					createWordpressPost.Author = editor.WordpressId
 					//Get old link
 					oldLink := strings.ReplaceAll(firstCategoryResult.OldUrl, "index.html", "") + slowtwitch.ConvertPostTitleToPath(postBase.Title, postBase.Id)
 					linkStatus := slowtwitch.GetPageStatus(oldLink)
@@ -272,33 +278,68 @@ func (migration MigratePosts) Execute() []PostResult {
 			postResults = append(postResults, batchResults...)
 		}
 	}
-	// Update related posts once work is done -- Why are there duplicates?
+	// Update related posts once work is done -- Do for all posts?
-	updatePostRelationships(postResults, migration)
+	allPostResults := GetAllPostResults(migration.ResultsDatabase)
+	updatePostRelationships(allPostResults, migration)
 
 	return postResults
 }
 
 func updatePostRelationships(postResults []PostResult, migration MigratePosts) {
 	fmt.Println("Updating post relationships")
-	for i, postResult := range postResults {
+	batchSize := 5
-		fmt.Println("Updating post", i+1, "/", len(postResults))
+	postResultWorkInput := make(chan PostResult)
+	//Set up a wait group to wait for the input channel to close after execution
+	var wg sync.WaitGroup
+	wg.Add(1)
+	wg.Add(len(postResults))
+
+	//Launch go routines that will read from the input channel,
+	//maxed out at the batch size
+	for i := 0; i < batchSize; i++ {
+		go func() {
+			for result := range postResultWorkInput {
+				updatePostRelationship(result, migration)
+				wg.Done()
+			}
+		}()
+	}
+
+	//Launch an unbuffered channel that will fill the channel with work
+	//as the workers take work from the channel. This will be blocked while
+	//any task is waiting to be picked up from the channel
+	go func() {
+		for _, result := range postResults {
+			postResultWorkInput <- result
+		}
+
+		close(postResultWorkInput)
+		wg.Done()
+	}()
+
+	wg.Wait()
+	fmt.Println("Done with post relationships")
+}
+
+func updatePostRelationship(postResult PostResult, migration MigratePosts) bool {
 	if postResult.IsSuccess {
 		var relatedWordpressIds []int
 
 		relatedSlowtwitchIds, slowtwitchIdsErr := slowtwitch.GetRelatedArticleIds(postResult.SlowtwitchId, migration.SlowtwitchDatabase)
 
 		if slowtwitchIdsErr != nil || len(relatedSlowtwitchIds) == 0 {
-				continue
+			return false
 		}
 		for _, slowtwitchRelatedId := range relatedSlowtwitchIds {
 			wordpressRelatedId, wordpressIdErr := GetWordpressPostIdBySlowtwitchPostId(slowtwitchRelatedId, migration.ResultsDatabase)
 			if wordpressIdErr != nil {
-					continue
+				return false
 			}
 			relatedWordpressIds = append(relatedWordpressIds, wordpressRelatedId)
 		}
 
 		if len(relatedWordpressIds) > 0 {
+			fmt.Println("Updating post in WP", postResult.WordpressId)
 			updateWordpressRelatedPosts := wordpress.UpdateAcfRelatedPosts{
 				Acf: wordpress.AcfRelatedPosts{
 					PostIds: relatedWordpressIds,
@@ -307,10 +348,12 @@ func updatePostRelationships(postResults []PostResult, migration MigratePosts) {
 			updateRelatedPostErr := updateWordpressRelatedPosts.Execute(migration.WordpressBaseUrl, migration.WordpressUser, migration.WordpressPassword, postResult.WordpressId)
 			if updateRelatedPostErr != nil {
 				fmt.Println("Error updating wordpressRelatedPosts", updateRelatedPostErr.Error())
+			} else {
+				return true
 			}
 		}
 	}
-	}
+	return false
 }
 
 func getPostIdsThatNeedMigration(slowtwitchPostIds, migratedPostIds []int) []int {

services/migration/post-result.go

@@ -1,6 +1,9 @@
 package migration
 
-import "database/sql"
+import (
+	"database/sql"
+	"log"
+)
 
 type PostResult struct {
 	WordpressId  int
@@ -12,6 +15,28 @@ type PostResult struct {
 	ErrorMessage string
 }
 
+func GetAllPostResults(db *sql.DB) []PostResult {
+	var results []PostResult
+	rows, err := db.Query("select WordpressId, SlowtwitchId, OldUrl, OldUrlStatus, NewUrl, (IsSuccess = b'1'), ErrorMessage from PostResults")
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	defer rows.Close()
+
+	for rows.Next() {
+		result := PostResult{}
+		err = rows.Scan(&result.WordpressId, &result.SlowtwitchId, &result.OldUrl, &result.OldUrlStatus, &result.NewUrl, &result.IsSuccess, &result.ErrorMessage)
+		if err != nil {
+			log.Fatal(err)
+		}
+		results = append(results, result)
+	}
+
+	return results
+}
+
 func CreatePostResult(parameters PostResult, db *sql.DB) (int, error) {
 	result, err := db.Exec("insert into PostResults (WordpressId, SlowtwitchId, OldUrl, OldUrlStatus, NewUrl, IsSuccess, ErrorMessage) values (?, ?, ?, ?, ?, ?, ?)", parameters.WordpressId, parameters.SlowtwitchId, parameters.OldUrl, parameters.OldUrlStatus, parameters.NewUrl, parameters.IsSuccess, parameters.ErrorMessage)
 	if err != nil {

services/slowtwitch/url-converter.go

@@ -28,5 +28,9 @@ func convert(path string) string {
 	output = strings.ReplaceAll(output, "?", "")
 	output = strings.ReplaceAll(output, ",", "")
 	output = strings.ReplaceAll(output, "%", "%25")
+	output = strings.ReplaceAll(output, "_&", "")
+	output = strings.ReplaceAll(output, "&", "")
+	output = strings.ReplaceAll(output, "#", "")
+	output = strings.ReplaceAll(output, ";", "")
 	return output
 }