- delete migration file

go.mod

@@ -124,5 +124,4 @@ require (
 )
 
 // replace github.com/signaux-faibles/libwekan => ../libwekan
-
 //replace github.com/signaux-faibles/goSirene => ../goSirene

pkg/core/kanban.go

@@ -20,7 +20,7 @@ type KanbanService interface {
 	ExportFollowsForUser(ctx context.Context, params KanbanSelectCardsForUserParams, db *pgxpool.Pool, roles []string) (KanbanExports, error)
 	SelectKanbanExportsWithSiret(ctx context.Context, siret string, username string, db *pgxpool.Pool, roles []string) (KanbanExports, error)
 	GetUser(username libwekan.Username) (libwekan.User, bool)
-	CreateCard(ctx context.Context, params KanbanNewCardParams, username libwekan.Username, assignees []libwekan.Username, db *pgxpool.Pool) (KanbanCard, error)
+	CreateCard(ctx context.Context, params KanbanNewCardParams, username libwekan.Username, membersUsernames []libwekan.Username, db *pgxpool.Pool) (KanbanCard, error)
 	UnarchiveCard(ctx context.Context, cardID libwekan.CardID, username libwekan.Username) error
 	SelectBoardsForUsername(username libwekan.Username) []libwekan.ConfigBoard
 	ClearBoardIDs(boardIDs []libwekan.BoardID, user libwekan.User) []libwekan.BoardID

pkg/kanban/cardFromCardID.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"datapi/pkg/core"
 	"datapi/pkg/utils"
-	"fmt"
 	"github.com/signaux-faibles/libwekan"
 )
 
@@ -26,20 +25,18 @@ func wekanToKanbanJoinActivities(wekanActivities []libwekan.Activity) []core.Kan
 	var kanbanActivities []core.KanbanActivity
 	var mapActivity = make(map[libwekan.UserID]core.KanbanActivity)
 	for _, wekanActivity := range wekanActivities {
-		if wekanActivity.ActivityType == "joinMember" {
+		if wekanActivity.ActivityType == "joinMember" || wekanActivity.ActivityType == "joinAssignee" {
 			from := wekanActivity.ModifiedAt
 			mapActivity[wekanActivity.MemberID] = core.KanbanActivity{
 				MemberID: wekanActivity.MemberID,
 				From:     &from,
 			}
-		} else if wekanActivity.ActivityType == "unjoinMember" {
+		} else if wekanActivity.ActivityType == "unjoinMember" || wekanActivity.ActivityType == "unjoinAssignee" {
 			activity := mapActivity[wekanActivity.MemberID]
 			to := wekanActivity.ModifiedAt
 			activity.To = &to
 			kanbanActivities = append(kanbanActivities, activity)
 			delete(mapActivity, wekanActivity.MemberID)
-		} else {
-			fmt.Println(wekanActivity, "ignoré")
 		}
 	}
 	for _, activity := range mapActivity {

pkg/kanban/createCard.go

@@ -13,12 +13,12 @@ import (
 )
 
 // CreateCard permet la création d'une carte dans la base de données wekan
-func (service wekanService) CreateCard(ctx context.Context, params core.KanbanNewCardParams, username libwekan.Username, assignees []libwekan.Username, db *pgxpool.Pool) (core.KanbanCard, error) {
+func (service wekanService) CreateCard(ctx context.Context, params core.KanbanNewCardParams, username libwekan.Username, membersUsernames []libwekan.Username, db *pgxpool.Pool) (core.KanbanCard, error) {
 	user, ok := GetUser(username)
 	if !ok {
 		return core.KanbanCard{}, core.ForbiddenError{Reason: "l'utilisateur n'est pas enregistré dans wekan"}
 	}
-	assigneesUsers := utils.Convert(assignees, func(username libwekan.Username) libwekan.User {
+	members := utils.Convert(membersUsernames, func(username libwekan.Username) libwekan.User {
 		user, _ := GetUser(username)
 		return user
 	})
@@ -42,12 +42,19 @@ func (service wekanService) CreateCard(ctx context.Context, params core.KanbanNe
 		return core.KanbanCard{}, err
 	}
 
-	card, err := buildCard(board, list.ID, swimlane.ID, params.Description, params.Siret, user, assigneesUsers, etablissement, params.Labels)
+	card, err := buildCard(board, list.ID, swimlane.ID, params.Description, params.Siret, user, etablissement, params.Labels)
 	if err != nil {
 		return core.KanbanCard{}, err
 	}
 	kanbanCard := wekanCardToKanbanCard(username)(card)
-	return kanbanCard, wekan.InsertCard(ctx, card)
+	err = wekan.InsertCard(ctx, card)
+	if err != nil {
+		return core.KanbanCard{}, err
+	}
+	for _, member := range members {
+		wekan.EnsureMemberInCard(ctx, card, member, member)
+	}
+	return kanbanCard, nil
 }
 
 func buildCard(
@@ -57,14 +64,13 @@ func buildCard(
 	description string,
 	siret core.Siret,
 	user libwekan.User,
-	assignees []libwekan.User,
 	etablissement core.EtablissementData,
 	labels []libwekan.BoardLabelName,
 ) (libwekan.Card, error) {
 	card := libwekan.BuildCard(configBoard.Board.ID, listID, swimlaneID, etablissement.RaisonSociale, description, user.ID)
 
 	// le créateur de la carte est assigné automatiquement
-	card.Assignees = utils.Convert(assignees, func(user libwekan.User) libwekan.UserID { return user.ID })
+	card.Assignees = []libwekan.UserID{}
 
 	activiteField := buildActiviteField(configBoard, etablissement.CodeActivite, etablissement.LibelleActivite)
 	effectifField := buildEffectifField(configBoard, etablissement.Effectif)