Merge pull request #832 from factly/ref/migrationID-field

ref: changed 'is_migration' field in post entities to migration_id

docker-compose.yml

@@ -116,7 +116,7 @@ services:
     ports:
       - "7700:7700"
     volumes:
-      - ~/factly/dega/meilisearch-0-27-1/data.ms/:/data.ms
+      - ~/factly/dega/meilisearch-0-28-0/data.ms/:/data.ms
     environment:
       # To put an upper limit of 100MB for the payload size during indexing
       - MEILI_HTTP_PAYLOAD_SIZE_LIMIT=104857600
@@ -237,7 +237,7 @@ services:
       - kavach-migrate
     ports:
       - 5001:8000
-    image: factly/kavach-server:0.27.4
+    image: factly/kavach-server:0.28.2
     volumes:
       - type: bind
         source: ./volumes/kavach-server/data
@@ -281,7 +281,7 @@ services:
       - postgres
       - keto
       - kratos
-    image: factly/kavach-server:0.27.4
+    image: factly/kavach-server:0.28.2
     volumes:
       - type: bind
         source: ./volumes/kavach-server/data
@@ -321,7 +321,7 @@ services:
       - dega
 
   kavach-web:
-    image: factly/kavach-web:0.27.4-dev
+    image: factly/kavach-web:0.28.2-dev
     volumes:
       - type: bind
         source: ./volumes/kavach-web/config.js

server/service/core/action/page/create.go

@@ -127,10 +127,13 @@ func create(w http.ResponseWriter, r *http.Request) {
 		FooterCode:       page.FooterCode,
 		SpaceID:          uint(sID),
 		DescriptionAMP:   page.DescriptionAMP,
-		IsMigrated:       page.IsMigrated,
 		MigratedHTML:     page.MigratedHTML,
 	}
 
+	if page.MigrationID != nil {
+		result.Post.MigrationID = *page.MigrationID
+	}
+
 	if len(page.TagIDs) > 0 {
 		config.DB.Model(&model.Tag{}).Where(page.TagIDs).Find(&result.Post.Tags)
 	}

server/service/core/action/page/route.go

@@ -31,7 +31,7 @@ type page struct {
 	FooterCode       string         `json:"footer_code"`
 	MetaFields       postgres.Jsonb `json:"meta_fields" swaggertype:"primitive,string"`
 	DescriptionAMP   string         `json:"description_amp"`
-	IsMigrated       bool           `json:"is_migrated"`
+	MigrationID      *uint          `json:"migration_id"`
 	MigratedHTML     string         `json:"migrated_html"`
 	SpaceID          uint           `json:"space_id"`
 	CategoryIDs      []uint         `json:"category_ids"`

server/service/core/action/page/update.go

@@ -191,10 +191,12 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"header_code":        page.HeaderCode,
 		"footer_code":        page.FooterCode,
 		"is_featured":        page.IsFeatured,
-		"is_migrated":        page.IsMigrated,
 		"description_amp":    page.DescriptionAMP,
 		"migrated_html":      page.MigratedHTML,
 	}
+	if page.MigrationID != nil {
+		updateMap["migration_id"] = *page.MigrationID
+	}
 
 	result.Post.FeaturedMediumID = &page.FeaturedMediumID
 	if page.FeaturedMediumID == 0 {

server/service/core/action/post/create.go

@@ -218,10 +218,13 @@ func createPost(ctx context.Context, post post, status string, r *http.Request)
 		MetaFields:       post.MetaFields,
 		SpaceID:          uint(sID),
 		DescriptionAMP:   post.DescriptionAMP,
-		IsMigrated:       post.IsMigrated,
 		MigratedHTML:     post.MigratedHTML,
 	}
 
+	if post.MigrationID != nil {
+		result.Post.MigrationID = *post.MigrationID
+	}
+
 	if status == "publish" {
 		if post.PublishedDate == nil {
 			currTime := time.Now()

server/service/core/action/post/route.go

@@ -34,7 +34,7 @@ type post struct {
 	FooterCode       string         `json:"footer_code"`
 	MetaFields       postgres.Jsonb `json:"meta_fields" swaggertype:"primitive,string"`
 	DescriptionAMP   string         `json:"description_amp"`
-	IsMigrated       bool           `json:"is_migrated"`
+	MigrationID      *uint           `json:"migration_id"`
 	MigratedHTML     string         `json:"migrated_html"`
 	CategoryIDs      []uint         `json:"category_ids"`
 	TagIDs           []uint         `json:"tag_ids"`

server/service/core/action/post/update.go

@@ -201,11 +201,14 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"header_code":        post.HeaderCode,
 		"footer_code":        post.FooterCode,
 		"meta_fields":        post.MetaFields,
-		"is_migrated":        post.IsMigrated,
 		"description_amp":    post.DescriptionAMP,
 		"migrated_html":      post.MigratedHTML,
 	}
 
+	if post.MigrationID != nil {
+		updateMap["migration_id"] = *post.MigrationID
+	}
+
 	result.Post.FeaturedMediumID = &post.FeaturedMediumID
 	if post.FeaturedMediumID == 0 {
 		updateMap["featured_medium_id"] = nil

server/service/core/model/post.go

@@ -35,7 +35,7 @@ type Post struct {
 	HeaderCode       string         `gorm:"column:header_code" json:"header_code"`
 	FooterCode       string         `gorm:"column:footer_code" json:"footer_code"`
 	DescriptionAMP   string         `gorm:"column:description_amp" json:"description_amp"`
-	IsMigrated       bool           `gorm:"column:is_migrated;default:false;" json:"is_migrated"`
+	MigrationID      uint           `gorm:"column:migration_id;default:NULL;" json:"migration_id"`
 	MigratedHTML     string         `gorm:"column:migrated_html" json:"migrated_html"`
 	MetaFields       postgres.Jsonb `gorm:"column:meta_fields" json:"meta_fields" swaggertype:"primitive,string"`
 	Tags             []Tag          `gorm:"many2many:post_tags;" json:"tags"`

server/service/fact-check/action/claim/create.go

@@ -135,7 +135,7 @@ func create(w http.ResponseWriter, r *http.Request) {
 		SpaceID:         uint(sID),
 		MediumID:        mediumID,
 		DescriptionAMP:  claim.DescriptionAMP,
-		IsMigrated:      claim.IsMigrated,
+		MigrationID:     claim.MigrationID,
 		MigratedHTML:    claim.MigratedHTML,
 	}
 

server/service/fact-check/action/claim/route.go

@@ -29,7 +29,7 @@ type claim struct {
 	HeaderCode     string         `json:"header_code"`
 	FooterCode     string         `json:"footer_code"`
 	DescriptionAMP string         `json:"description_amp"`
-	IsMigrated     bool           `json:"is_migrated"`
+	MigrationID    *uint           `json:"migration_id"`
 	MigratedHTML   string         `json:"migrated_html"`
 }
 

server/service/fact-check/action/claim/update.go

@@ -157,10 +157,14 @@ func update(w http.ResponseWriter, r *http.Request) {
 		"header_code":      claim.HeaderCode,
 		"footer_code":      claim.FooterCode,
 		"medium_id":        claim.MediumID,
-		"is_migrated":      claim.IsMigrated,
 		"description_amp":  claim.DescriptionAMP,
 		"migrated_html":    claim.MigratedHTML,
 	}
+
+	if claim.MigrationID != nil {
+		updateMap["migration_id"] = *claim.MigrationID
+	}
+
 	if claim.MediumID == 0 {
 		updateMap["medium_id"] = nil
 	}

server/service/fact-check/model/claim.go

@@ -23,7 +23,7 @@ type Claim struct {
 	Description     postgres.Jsonb `gorm:"column:description" json:"description" swaggertype:"primitive,string"`
 	DescriptionHTML string         `gorm:"column:description_html" json:"description_html,omitempty"`
 	DescriptionAMP  string         `gorm:"column:description_amp" json:"description_amp"`
-	IsMigrated      bool           `gorm:"column:is_migrated;default:false;" json:"is_migrated"`
+	MigrationID     *uint          `gorm:"column:migration_id;default:NULL;" json:"migration_id"`
 	MigratedHTML    string         `gorm:"column:migrated_html" json:"migrated_html"`
 	ClaimantID      uint           `gorm:"column:claimant_id" json:"claimant_id"`
 	Claimant        Claimant       `json:"claimant"`