[WIP] Consumer deletion

openapi/openapi.yaml

@@ -670,6 +670,9 @@ components:
             updated_at:
               type: string
               format: date-time
+            deleted_at:
+              type: string
+              format: date-time
     ConsumerList:
       allOf:
         - $ref: '#/components/schemas/List'

pkg/api/openapi/api/openapi.yaml

@@ -1075,6 +1075,9 @@ components:
         updated_at:
           format: date-time
           type: string
+        deleted_at:
+          format: date-time
+          type: string
       type: object
       example: null
     ConsumerList_allOf:

pkg/api/openapi/docs/Consumer.md

@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **Labels** | Pointer to **map[string]string** |  | [optional] 
 **CreatedAt** | Pointer to **time.Time** |  | [optional] 
 **UpdatedAt** | Pointer to **time.Time** |  | [optional] 
+**DeletedAt** | Pointer to **time.Time** |  | [optional] 
 
 ## Methods
 
@@ -206,6 +207,31 @@ SetUpdatedAt sets UpdatedAt field to given value.
 
 HasUpdatedAt returns a boolean if a field has been set.
 
+### GetDeletedAt
+
+`func (o *Consumer) GetDeletedAt() time.Time`
+
+GetDeletedAt returns the DeletedAt field if non-nil, zero value otherwise.
+
+### GetDeletedAtOk
+
+`func (o *Consumer) GetDeletedAtOk() (*time.Time, bool)`
+
+GetDeletedAtOk returns a tuple with the DeletedAt field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetDeletedAt
+
+`func (o *Consumer) SetDeletedAt(v time.Time)`
+
+SetDeletedAt sets DeletedAt field to given value.
+
+### HasDeletedAt
+
+`func (o *Consumer) HasDeletedAt() bool`
+
+HasDeletedAt returns a boolean if a field has been set.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

pkg/api/openapi/docs/ConsumerAllOf.md

@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **Labels** | Pointer to **map[string]string** |  | [optional] 
 **CreatedAt** | Pointer to **time.Time** |  | [optional] 
 **UpdatedAt** | Pointer to **time.Time** |  | [optional] 
+**DeletedAt** | Pointer to **time.Time** |  | [optional] 
 
 ## Methods
 
@@ -128,6 +129,31 @@ SetUpdatedAt sets UpdatedAt field to given value.
 
 HasUpdatedAt returns a boolean if a field has been set.
 
+### GetDeletedAt
+
+`func (o *ConsumerAllOf) GetDeletedAt() time.Time`
+
+GetDeletedAt returns the DeletedAt field if non-nil, zero value otherwise.
+
+### GetDeletedAtOk
+
+`func (o *ConsumerAllOf) GetDeletedAtOk() (*time.Time, bool)`
+
+GetDeletedAtOk returns a tuple with the DeletedAt field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetDeletedAt
+
+`func (o *ConsumerAllOf) SetDeletedAt(v time.Time)`
+
+SetDeletedAt sets DeletedAt field to given value.
+
+### HasDeletedAt
+
+`func (o *ConsumerAllOf) HasDeletedAt() bool`
+
+HasDeletedAt returns a boolean if a field has been set.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

pkg/api/presenters/consumer.go

@@ -19,7 +19,7 @@ func ConvertConsumer(consumer openapi.Consumer) *api.Consumer {
 
 func PresentConsumer(consumer *api.Consumer) openapi.Consumer {
 	reference := PresentReference(consumer.ID, consumer)
-	return openapi.Consumer{
+	converted := openapi.Consumer{
 		Id:        reference.Id,
 		Kind:      reference.Kind,
 		Href:      reference.Href,
@@ -28,4 +28,8 @@ func PresentConsumer(consumer *api.Consumer) openapi.Consumer {
 		CreatedAt: openapi.PtrTime(consumer.CreatedAt),
 		UpdatedAt: openapi.PtrTime(consumer.UpdatedAt),
 	}
+	if !consumer.DeletedAt.Time.IsZero() {
+		converted.DeletedAt = openapi.PtrTime(consumer.DeletedAt.Time)
+	}
+	return converted
 }

pkg/dao/consumer.go

@@ -31,7 +31,7 @@ func NewConsumerDao(sessionFactory *db.SessionFactory) ConsumerDao {
 func (d *sqlConsumerDao) Get(ctx context.Context, id string) (*api.Consumer, error) {
 	g2 := (*d.sessionFactory).New(ctx)
 	var consumer api.Consumer
-	if err := g2.Take(&consumer, "id = ?", id).Error; err != nil {
+	if err := g2.Unscoped().Take(&consumer, "id = ?", id).Error; err != nil {
 		return nil, err
 	}
 	return &consumer, nil

pkg/handlers/consumer.go

@@ -84,7 +84,7 @@ func (h consumerHandler) List(w http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
 
 			listArgs := services.NewListArguments(r.URL.Query())
-			var consumers = []api.Consumer{}
+			consumers := []api.Consumer{}
 			paging, err := h.generic.List(ctx, "username", listArgs, &consumers)
 			if err != nil {
 				return nil, err
@@ -132,10 +132,15 @@ func (h consumerHandler) Get(w http.ResponseWriter, r *http.Request) {
 	handleGet(w, r, cfg)
 }
 
+// Delete will softly delete the consumer(hard deletion is restricted by the foreign key in resources table)
 func (h consumerHandler) Delete(w http.ResponseWriter, r *http.Request) {
 	cfg := &handlerConfig{
 		Action: func() (interface{}, *errors.ServiceError) {
-			return nil, errors.NotImplemented("delete")
+			id := mux.Vars(r)["id"]
+			if err := h.consumer.Delete(r.Context(), id); err != nil {
+				return nil, err
+			}
+			return nil, nil
 		},
 	}
 	handleDelete(w, r, cfg, http.StatusNoContent)