Don't require ticket status and type (#162)

* dont require status and type

* check if ticket type id exists on template before setting type

* leave better comments/better var names

pkg/tasks/local/ticket.go

@@ -78,10 +78,13 @@ func (m *localCreateTicket) Process(ctx context.Context, task *v1.Task, cc types
  ticketRequestBody := &v2.TicketRequest{
  DisplayName: template.DisplayName,
  Description: template.Description,
- Type: &v2.TicketType{
+ Labels: template.Labels,
+ }
+
+ if template.TypeId != "" {
+ ticketRequestBody.Type = &v2.TicketType{
  Id: template.TypeId,
- },
- Labels: template.Labels,
+ }
  }
 
  if template.StatusId != "" {

pkg/types/ticket/custom_fields.go

@@ -244,39 +244,36 @@ func GetCustomFieldValue(field *v2.TicketCustomField) (interface{}, error) {
 func ValidateTicket(ctx context.Context, schema *v2.TicketSchema, ticket *v2.Ticket) (bool, error) {
  l := ctxzap.Extract(ctx)
 
- // Look for a matching status
- foundMatch := false
- for _, status := range schema.GetStatuses() {
- // Status is not required
- if ticket.Status == nil {
- foundMatch = true
- break
- }
-
- if ticket.Status.GetId() == status.GetId() {
- foundMatch = true
- break
+ // Validate the ticket status is one defined in the schema
+ // Ticket status is not required so if a ticket doesn't have a status
+ // we don't need to validate, skip the loop in this case
+ validTicketStatus := ticket.Status == nil
+ if !validTicketStatus {
+ for _, status := range schema.GetStatuses() {
+ if ticket.Status.GetId() == status.GetId() {
+ validTicketStatus = true
+ break
+ }
  }
  }
-
- if !foundMatch {
+ if !validTicketStatus {
  l.Debug("error: invalid ticket: could not find status", zap.String("status_id", ticket.Status.GetId()))
  return false, nil
  }
 
- // Look for a matching ticket type
- foundMatch = false
- for _, tType := range schema.GetTypes() {
- if ticket.Type == nil {
- return false, nil
- }
- if ticket.Type.GetId() == tType.GetId() {
- foundMatch = true
- break
+ // Validate the ticket type is one defined in the schema
+ // Ticket type is not required so if a ticket doesn't have a type
+ // we don't need to validate, skip the loop in this case
+ validTicketType := ticket.Type == nil
+ if !validTicketType {
+ for _, tType := range schema.GetTypes() {
+ if ticket.Type.GetId() == tType.GetId() {
+ validTicketType = true
+ break
+ }
  }
  }
-
- if !foundMatch {
+ if !validTicketType {
  l.Debug("error: invalid ticket: could not find ticket type", zap.String("ticket_type_id", ticket.Type.GetId()))
  return false, nil
  }
@@ -360,7 +357,7 @@ func ValidateTicket(ctx context.Context, schema *v2.TicketSchema, ticket *v2.Tic
  return false, nil
  }
 
- foundMatch = false
+ foundMatch := false
  for _, m := range allowedValues {
  if m == ticketValue {
  foundMatch = true
@@ -435,7 +432,7 @@ func ValidateTicket(ctx context.Context, schema *v2.TicketSchema, ticket *v2.Tic
  return false, nil
  }
 
- foundMatch = false
+ foundMatch := false
  for _, m := range allowedValues {
  if m.GetId() == ticketValue.GetId() {
  foundMatch = true