Update CMS Entity and Forms to Include New Fields

- Added new fields to the CMS entity: CompanyName, Country, and Language, enhancing the data structure for better content management.
- Updated the CMSForm to include validation and examples for the new fields, ensuring proper input handling.
- Modified the copyFormToEntity method in the CMS service to map the new fields from the form to the entity, maintaining data integrity.
- Enhanced Swagger documentation to reflect the changes in the CMS API, providing clear examples for the new fields.

cmd/web/docs/docs.go

@@ -7744,9 +7744,17 @@ const docTemplate = `{
                 "chart": {
                     "$ref": "#/definitions/cms.chartSectionForm"
                 },
+                "company_name": {
+                    "type": "string",
+                    "example": "Opplens"
+                },
                 "contact": {
                     "$ref": "#/definitions/cms.contactSectionForm"
                 },
+                "country": {
+                    "type": "string",
+                    "example": "SWE"
+                },
                 "features": {
                     "$ref": "#/definitions/cms.cardSectionForm"
                 },
@@ -7759,6 +7767,10 @@ const docTemplate = `{
                 "key": {
                     "type": "string",
                     "example": "SW-001"
+                },
+                "language": {
+                    "type": "string",
+                    "example": "en"
                 }
             }
         },

cmd/web/docs/swagger.json

@@ -7736,9 +7736,17 @@
                 "chart": {
                     "$ref": "#/definitions/cms.chartSectionForm"
                 },
+                "company_name": {
+                    "type": "string",
+                    "example": "Opplens"
+                },
                 "contact": {
                     "$ref": "#/definitions/cms.contactSectionForm"
                 },
+                "country": {
+                    "type": "string",
+                    "example": "SWE"
+                },
                 "features": {
                     "$ref": "#/definitions/cms.cardSectionForm"
                 },
@@ -7751,6 +7759,10 @@
                 "key": {
                     "type": "string",
                     "example": "SW-001"
+                },
+                "language": {
+                    "type": "string",
+                    "example": "en"
                 }
             }
         },

cmd/web/docs/swagger.yaml

@@ -30,8 +30,14 @@ definitions:
         $ref: '#/definitions/cms.cardSectionForm'
       chart:
         $ref: '#/definitions/cms.chartSectionForm'
+      company_name:
+        example: Opplens
+        type: string
       contact:
         $ref: '#/definitions/cms.contactSectionForm'
+      country:
+        example: SWE
+        type: string
       features:
         $ref: '#/definitions/cms.cardSectionForm'
       footer:
@@ -41,6 +47,9 @@ definitions:
       key:
         example: SW-001
         type: string
+      language:
+        example: en
+        type: string
     type: object
   cms.CMSListResponse:
     properties:

internal/cms/entity.go

@@ -9,14 +9,17 @@ import (
 // CMS represents the content management system for the landing page
 type CMS struct {
 	mongo.Model `bson:",inline"`
-	Key         string         `bson:"key" json:"key" validate:"required"`
+	Key         string         `bson:"key"`
-	Hero        heroSection    `bson:"hero" json:"hero"`
+	Language    string         `bson:"language"`
-	Chart       chartSection   `bson:"chart" json:"chart"`
+	CompanyName string         `bson:"company_name"`
-	Features    cardSection    `bson:"features" json:"features"`
+	Country     string         `bson:"country"`
-	Challenges  cardSection    `bson:"challenges" json:"challenges"`
+	Hero        heroSection    `bson:"hero"`
-	Advantages  cardSection    `bson:"advantages" json:"advantages"`
+	Chart       chartSection   `bson:"chart"`
-	Contact     contactSection `bson:"contact" json:"contact"`
+	Features    cardSection    `bson:"features"`
-	Footer      footerSection  `bson:"footer" json:"footer"`
+	Challenges  cardSection    `bson:"challenges"`
+	Advantages  cardSection    `bson:"advantages"`
+	Contact     contactSection `bson:"contact"`
+	Footer      footerSection  `bson:"footer"`
 }
 
 // SetID sets the CMS ID (implements IDSetter interface)

internal/cms/form.go

@@ -4,14 +4,17 @@ import "tm/pkg/response"
 
 // CMSForm represents the form for creating/updating the CMS
 type CMSForm struct {
-	Key        string             `json:"key" valid:"required,length(2|100)" example:"SW-001"`
+	Key         string             `json:"key" valid:"required,length(2|100)" example:"SW-001"`
-	Hero       heroSectionForm    `json:"hero" valid:"optional"`
+	Language    string             `json:"language" valid:"optional,length(2|100)" example:"en"`
-	Chart      chartSectionForm   `json:"chart" valid:"optional"`
+	CompanyName string             `json:"company_name" valid:"optional,length(2|100)" example:"Opplens"`
-	Features   cardSectionForm    `json:"features" valid:"optional"`
+	Country     string             `json:"country" valid:"optional,length(3)" example:"SWE"`
-	Challenges cardSectionForm    `json:"challenges" valid:"optional"`
+	Hero        heroSectionForm    `json:"hero" valid:"optional"`
-	Advantages cardSectionForm    `json:"advantages" valid:"optional"`
+	Chart       chartSectionForm   `json:"chart" valid:"optional"`
-	Contact    contactSectionForm `json:"contact" valid:"optional"`
+	Features    cardSectionForm    `json:"features" valid:"optional"`
-	Footer     footerSectionForm  `json:"footer" valid:"optional"`
+	Challenges  cardSectionForm    `json:"challenges" valid:"optional"`
+	Advantages  cardSectionForm    `json:"advantages" valid:"optional"`
+	Contact     contactSectionForm `json:"contact" valid:"optional"`
+	Footer      footerSectionForm  `json:"footer" valid:"optional"`
 }
 
 // heroSectionForm represents the form for creating/updating the hero section

internal/cms/service.go

@@ -236,6 +236,15 @@ func (s *cmsService) Search(ctx context.Context, form *SearchCMSForm, pagination
 
 // copyFormToEntity copies data from form to entity
 func (s *cmsService) copyFormToEntity(form *CMSForm, cms *CMS) {
+	if form.Language != "" {
+		cms.Language = form.Language
+	}
+	if form.CompanyName != "" {
+		cms.CompanyName = form.CompanyName
+	}
+	if form.Country != "" {
+		cms.Country = form.Country
+	}
 	// Hero section
 	if form.Hero.Title != "" {
 		cms.Hero.Title = form.Hero.Title