moved voters key to status of poll xr

web-seven · Sep 25, 2024 · e0676b9 · e0676b9
1 parent e06dc9c
commit e0676b9
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 32 deletions.
diff --git a/example/xr.yaml b/example/xr.yaml
@@ -4,12 +4,13 @@ metadata:
   name: meal
 spec:
   deliveryTime: 0
-  dueOrderTime: 15
+  dueOrderTime: 20
   dueTakeTime: 0
-  voters: []
   title: "meal"
-  schedule: "0 * * * *"
-  messages: 
+  schedule: "49 14 * * *"
+  messages:
     question: "how are you?"
     response: "thank you for response."
     result:  "here are the voting results:"
+status:
+  lastNotificationTime: 1
diff --git a/internal/slack-collector/main.go b/internal/slack-collector/main.go
@@ -60,13 +60,13 @@ type Poll struct {
 		DueOrderTime int64   `json:"dueOrderTime"`
 		DueTakeTime  int64   `json:"dueTakeTime"`
 		Schedule     string  `json:"schedule"`
-		Voters       []Voter `json:"voters"`
 		Title        string  `json:"title"`
 		Messages     Message `json:"messages"`
 	} `json:"spec"`
 	Status struct {
-		Done                 bool  `json:"done"`
-		LastNotificationTime int64 `json:"lastNotificationTime"`
+		Voters               []Voter `json:"voters"`
+		Done                 bool    `json:"done"`
+		LastNotificationTime int64   `json:"lastNotificationTime"`
 	} `json:"status"`
 }
 
@@ -117,9 +117,9 @@ func patchVoterStatus(user, pollSlackName, selectedOption string, dynamicClient
 	}
 	response = pollResource.Spec.Messages.Response
 	foundUser := false
-	for i := range pollResource.Spec.Voters {
-		if pollResource.Spec.Voters[i].Name == user {
-			pollResource.Spec.Voters[i].Status = selectedOption
+	for i := range pollResource.Status.Voters {
+		if pollResource.Status.Voters[i].Name == user {
+			pollResource.Status.Voters[i].Status = selectedOption
 			foundUser = true
 			break
 		}
@@ -130,15 +130,30 @@ func patchVoterStatus(user, pollSlackName, selectedOption string, dynamicClient
 			Name:   user,
 			Status: selectedOption,
 		}
-		pollResource.Spec.Voters = append(pollResource.Spec.Voters, newVoter)
+		pollResource.Status.Voters = append(pollResource.Status.Voters, newVoter)
 	}
 
 	pollResource.GetObjectMeta().SetManagedFields(nil)
-	pollBytes, _ := json.Marshal(pollResource)
-	_, err = dynamicClient.Resource(resourceId).Namespace("").Patch(ctx, pollResource.GetObjectMeta().GetName(), types.MergePatchType, pollBytes, metav1.PatchOptions{FieldManager: "slack-collector"})
+
+	statusBytes, _ := json.Marshal(map[string]interface{}{
+		"status": map[string]interface{}{
+			"voters": pollResource.Status.Voters,
+		},
+	})
+
+	// Use the "/status" subresource to update just the status
+	_, err = dynamicClient.Resource(resourceId).Namespace("").Patch(
+		context.Background(),
+		pollResource.GetObjectMeta().GetName(),
+		types.MergePatchType,
+		statusBytes,
+		metav1.PatchOptions{FieldManager: "slack-collector"},
+		"/status",
+	)
 	if err != nil {
-		fmt.Println("Error patching poll resource", err)
+		fmt.Println("Error patching poll status", err)
 	}
+
 	return nil
 }
 

diff --git a/internal/slack-notify/main.go b/internal/slack-notify/main.go
@@ -46,13 +46,13 @@ type Poll struct {
 		DueOrderTime int64   `json:"dueOrderTime"`
 		DueTakeTime  int64   `json:"dueTakeTime"`
 		Schedule     string  `json:"schedule"`
-		Voters       []Voter `json:"voters"`
 		Title        string  `json:"title"`
 		Messages     Message `json:"messages"`
 	} `json:"spec"`
 	Status struct {
-		Done                 bool  `json:"done"`
-		LastNotificationTime int64 `json:"lastNotificationTime"`
+		Voters               []Voter `json:"voters"`
+		Done                 bool    `json:"done"`
+		LastNotificationTime int64   `json:"lastNotificationTime"`
 	} `json:"status"`
 }
 
@@ -112,7 +112,7 @@ func main() {
 		pollResource.GetObjectMeta().GetName(),
 		types.MergePatchType,
 		statusBytes,
-		metav1.PatchOptions{FieldManager: "slack-collector"},
+		metav1.PatchOptions{FieldManager: "slack-notify"},
 		"/status",
 	)
 	if err != nil {

diff --git a/internal/slackchannel/slackchannel.go b/internal/slackchannel/slackchannel.go
@@ -42,13 +42,13 @@ type Poll struct {
 		DueOrderTime int64   `json:"dueOrderTime"`
 		DueTakeTime  int64   `json:"dueTakeTime"`
 		Schedule     string  `json:"schedule"`
-		Voters       []Voter `json:"voters"`
 		Title        string  `json:"title"`
 		Messages     Message `json:"messages"`
 	} `json:"spec"`
 	Status struct {
-		Done                 bool  `json:"done"`
-		LastNotificationTime int64 `json:"lastNotificationTime"`
+		Voters               []Voter `json:"voters"`
+		Done                 bool    `json:"done"`
+		LastNotificationTime int64   `json:"lastNotificationTime"`
 	} `json:"status"`
 }
 
@@ -101,7 +101,7 @@ func SlackOrder(input *v1beta1.Input, api *slack.Client, xr *resource.Composite,
 	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(xr.Resource.Object, &poll); err != nil {
 		logger.Info("error converting Unstructured to Poll:", err)
 	}
-	textContent := countUsers(poll.Spec.Voters)
+	textContent := countUsers(poll.Status.Voters)
 
 	attachment := slack.Attachment{
 		Color:      "#f9a41b",
@@ -124,7 +124,7 @@ func SlackOrder(input *v1beta1.Input, api *slack.Client, xr *resource.Composite,
 	} else {
 		logger.Info("message successfully sent to channel", channelID, timestamp)
 	}
-	poll.Spec.Voters = []Voter{}
+	poll.Status.Voters = []Voter{}
 	xr.Resource.Object, err = runtime.DefaultUnstructuredConverter.ToUnstructured(&poll)
 	if err != nil {
 		logger.Info("error converting Poll to Unstructured:", err)

diff --git a/package/poll.yaml b/package/poll.yaml
@@ -18,15 +18,6 @@ spec:
           spec:
             type: object
             properties:
-              voters:
-                type: array
-                items:
-                  properties:
-                    name:
-                      type: string
-                    status:
-                      type: string
-                  type: object
               dueOrderTime:
                 type: integer
               dueTakeTime:
@@ -49,6 +40,15 @@ spec:
           status:
             type: object
             properties:
+              voters:
+                type: array
+                items:
+                  properties:
+                    name:
+                      type: string
+                    status:
+                      type: string
+                  type: object
               done:
                 type: boolean
               lastNotificationTime: