ctx always created just before ent.Save; msg for 500; offer non-check update

Author: xiahongze

gutils/tasks.go

@@ -32,9 +32,9 @@ func processEntity(ent *models.Entity) {
 		return
 	}
 	// save the entity before returning
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(CancelWaitTime))
 	defer func() {
-		if err := ent.Save(ctx, EntityType, DsClient); err != nil {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(CancelWaitTime))
+		if err := ent.Save(ctx, EntityType, DsClient, true); err != nil {
 			log.Println("ERROR: failed to save entity:", err, ". Entity: ", ent)
 		}
 		cancel()

handlers/create.go

@@ -54,7 +54,7 @@ func Create(c echo.Context) error {
 	entity := gutils.ConvReq2Ent(req)
 	ctx, cancel := context.WithTimeout(context.Background(), gutils.CancelWaitTime)
 	defer cancel()
-	if err := entity.Save(ctx, gutils.EntityType, gutils.DsClient); err != nil {
+	if err := entity.Save(ctx, gutils.EntityType, gutils.DsClient, false); err != nil {
 		return err
 	}
 

handlers/delete.go

@@ -21,13 +21,13 @@ func Delete(c echo.Context) error {
 	defer cancel()
 	entity := &models.Entity{}
 	if err := gutils.DsClient.Get(ctx, req.Key, entity); err != nil {
-		return err
+		return c.String(http.StatusInternalServerError, err.Error())
 	}
 
 	ctx1, cancel1 := context.WithTimeout(context.Background(), gutils.CancelWaitTime)
 	defer cancel1()
 	if err := gutils.DsClient.Delete(ctx1, req.Key); err != nil {
-		return err
+		return c.String(http.StatusInternalServerError, err.Error())
 	}
 
 	subject := fmt.Sprintf("[%s] <%s> INFO: %s!", email.Identity, entity.Name, "Deleted")

handlers/read.go

@@ -19,7 +19,7 @@ func Read(c echo.Context) error {
 	defer cancel()
 	entity := &models.Entity{}
 	if err := gutils.DsClient.Get(ctx, req.Key, entity); err != nil {
-		return err
+		return c.String(http.StatusInternalServerError, err.Error())
 	}
 	return c.JSON(http.StatusOK, entity)
 }

handlers/update.go

@@ -22,7 +22,7 @@ func Update(c echo.Context) error {
 	defer cancel()
 	entity := &models.Entity{}
 	if err := gutils.DsClient.Get(ctx, req.Key, entity); err != nil {
-		return err
+		return c.String(http.StatusInternalServerError, err.Error())
 	}
 
 	// update relevant fields
@@ -58,8 +58,8 @@ func Update(c echo.Context) error {
 	// update entity
 	ctx1, cancel1 := context.WithTimeout(context.Background(), gutils.CancelWaitTime)
 	defer cancel1()
-	if err := entity.Save(ctx1, gutils.EntityType, gutils.DsClient); err != nil {
-		return err
+	if err := entity.Save(ctx1, gutils.EntityType, gutils.DsClient, false); err != nil {
+		return c.String(http.StatusInternalServerError, err.Error())
 	}
 
 	subject := fmt.Sprintf("[%s] <%s> INFO: %s!", email.Identity, entity.Name, "Updated")

models/entity.go

@@ -31,7 +31,7 @@ type (
 )
 
 // Save saves the entry in the datastore
-func (entity *Entity) Save(ctx context.Context, entTypName string, dsClient *datastore.Client) (err error) {
+func (entity *Entity) Save(ctx context.Context, entTypName string, dsClient *datastore.Client, check bool) (err error) {
 	defer func() {
 		k, _ := json.Marshal(entity.K)
 		if err != nil {
@@ -47,7 +47,7 @@ func (entity *Entity) Save(ctx context.Context, entTypName string, dsClient *dat
 			if err := tx.Get(entity.K, &_ent); err != nil {
 				return err
 			}
-			if _ent.NextCheck.After(time.Now()) {
+			if _ent.NextCheck.After(time.Now()) && check {
 				return errors.New("Entity was updated by another goroutine")
 			}
 			if _, err := tx.Mutate(datastore.NewUpdate(entity.K, entity)); err != nil {