subscription_model -> subscription

go-backend/internal/models/membership.go

@@ -15,7 +15,7 @@ type Membership struct {
 	StartDate           time.Time         `json:"start_date"`
 	EndDate             time.Time         `json:"end_date"`
 	Status              int8              `json:"status" binding:"number,safe_content"`
-	SubscriptionModel   SubscriptionModel `gorm:"foreignKey:SubscriptionModelID" json:"subscription_model"`
+	SubscriptionModel   SubscriptionModel `gorm:"foreignKey:SubscriptionModelID" json:"subscription"`
 	SubscriptionModelID uint              `json:"subsription_model_id"`
 	ParentMembershipID  uint              `json:"parent_member_id" binding:"omitempty,omitnil,number"`
 }

go-backend/internal/models/user.go

@@ -441,7 +441,7 @@ func (u *User) Safe() map[string]interface{} {
 			"start_date": u.Membership.StartDate,
 			"end_date":   u.Membership.EndDate,
 			"status":     u.Membership.Status,
-			"subscription_model": map[string]interface{}{
+			"subscription": map[string]interface{}{
 				"id":                 u.Membership.SubscriptionModel.ID,
 				"name":               u.Membership.SubscriptionModel.Name,
 				"details":            u.Membership.SubscriptionModel.Details,

go-backend/pkg/errors/errors.go

@@ -66,7 +66,7 @@ var Responses = struct {
 		InternalServerError:         "server.error.internal_server_error",
 		InvalidJSON:                 "server.error.invalid_json",
 		InvalidUserID:               "server.validation.invalid_user_id",
-		InvalidSubscriptionModel:    "server.validation.invalid_subscription_model",
+		InvalidSubscriptionModel:    "server.validation.invalid_subscription",
 		Unauthorized:                "server.error.unauthorized",
 		UserNotFoundWrongPassword:   "server.validation.user_not_found_or_wrong_password",
 		JwtGenerationFailed:         "server.error.jwt_generation_failed",
@@ -82,7 +82,7 @@ var Responses = struct {
 	Fields: ValidationFields{
 		General:            "server.general",
 		ParentMembershipID: "parent_membership_id",
-		SubscriptionModel:  "subscription_model",
+		SubscriptionModel:  "subscription",
 		Login:              "user.login",
 		Email:              "user.email",
 		User:               "user.user",