refactor: openapi - update Tribe schema

api/openapi3.yml

@@ -813,6 +813,28 @@ components:
           $ref: "#/components/schemas/Building"
         wood:
           $ref: "#/components/schemas/Building"
+    TribeOpponentsDefeated:
+      type: object
+      required:
+        - rankAtt
+        - scoreAtt
+        - rankDef
+        - scoreDef
+        - rankTotal
+        - scoreTotal
+      properties:
+        rankAtt:
+          type: integer
+        scoreAtt:
+          type: integer
+        rankDef:
+          type: integer
+        scoreDef:
+          type: integer
+        rankTotal:
+          type: integer
+        scoreTotal:
+          type: integer
     Tribe:
       type: object
       required:
@@ -826,12 +848,7 @@ components:
         - numVillages
         - rank
         - dominance
-        - rankAtt
+        - opponentsDefeated
-        - scoreAtt
-        - rankDef
-        - scoreDef
-        - rankTotal
-        - scoreTotal
         - bestRank
         - bestRankAt
         - mostVillages
@@ -862,18 +879,8 @@ components:
         dominance:
           type: number
           format: double
-        rankAtt:
+        opponentsDefeated:
-          type: integer
+          $ref: "#/components/schemas/TribeOpponentsDefeated"
-        scoreAtt:
-          type: integer
-        rankDef:
-          type: integer
-        scoreDef:
-          type: integer
-        rankTotal:
-          type: integer
-        scoreTotal:
-          type: integer
         bestRank:
           type: integer
         bestRankAt:

internal/port/internal/apimodel/tribe.go

@@ -4,31 +4,37 @@ import (
 	"gitea.dwysokinski.me/twhelp/corev3/internal/domain"
 )
 
+func NewTribeOpponentsDefeated(od domain.OpponentsDefeated) TribeOpponentsDefeated {
+	return TribeOpponentsDefeated{
+		RankAtt:    od.RankAtt(),
+		RankDef:    od.RankDef(),
+		RankTotal:  od.RankTotal(),
+		ScoreAtt:   od.ScoreAtt(),
+		ScoreDef:   od.ScoreDef(),
+		ScoreTotal: od.ScoreTotal(),
+	}
+}
+
 func NewTribe(t domain.Tribe) Tribe {
 	converted := Tribe{
-		AllPoints:      t.AllPoints(),
+		AllPoints:         t.AllPoints(),
-		BestRank:       t.BestRank(),
+		BestRank:          t.BestRank(),
-		BestRankAt:     t.BestRankAt(),
+		BestRankAt:        t.BestRankAt(),
-		CreatedAt:      t.CreatedAt(),
+		CreatedAt:         t.CreatedAt(),
-		Dominance:      t.Dominance(),
+		Dominance:         t.Dominance(),
-		Id:             t.ID(),
+		Id:                t.ID(),
-		MostPoints:     t.MostPoints(),
+		MostPoints:        t.MostPoints(),
-		MostPointsAt:   t.MostPointsAt(),
+		MostPointsAt:      t.MostPointsAt(),
-		MostVillages:   t.MostVillages(),
+		MostVillages:      t.MostVillages(),
-		MostVillagesAt: t.MostVillagesAt(),
+		MostVillagesAt:    t.MostVillagesAt(),
-		Name:           t.Name(),
+		Name:              t.Name(),
-		NumMembers:     t.NumMembers(),
+		NumMembers:        t.NumMembers(),
-		NumVillages:    t.NumVillages(),
+		NumVillages:       t.NumVillages(),
-		Points:         t.Points(),
+		Points:            t.Points(),
-		ProfileUrl:     t.ProfileURL().String(),
+		ProfileUrl:        t.ProfileURL().String(),
-		Rank:           t.Rank(),
+		Rank:              t.Rank(),
-		RankAtt:        t.OD().RankAtt(),
+		OpponentsDefeated: NewTribeOpponentsDefeated(t.OD()),
-		RankDef:        t.OD().RankDef(),
+		Tag:               t.Tag(),
-		RankTotal:      t.OD().RankTotal(),
-		ScoreAtt:       t.OD().ScoreAtt(),
-		ScoreDef:       t.OD().ScoreDef(),
-		ScoreTotal:     t.OD().ScoreTotal(),
-		Tag:            t.Tag(),
 	}
 
 	if deletedAt := t.DeletedAt(); !deletedAt.IsZero() {