back round 0 view raw

appview: fix non-empty spindle removal #368

merged

opened by

oppi.li 4 months ago targeting master from push-xmplzvpqtnru

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+22

appview

ingester.go

spindles

spindles.go

+10

appview/ingester.go

···

       510
       510
        
       			i.Enforcer.E.LoadPolicy()

     

       511
       511
        
       		}()

     

       512
       512
        
       

     

       513
       513
       +
       		// remove spindle members first

     

       514
       514
       +
       		err = db.RemoveSpindleMember(

     

       515
       515
       +
       			tx,

     

       516
       516
       +
       			db.FilterEq("owner", did),

     

       517
       517
       +
       			db.FilterEq("instance", instance),

     

       518
       518
       +
       		)

     

       519
       519
       +
       		if err != nil {

     

       520
       520
       +
       			return err

     

       521
       521
       +
       		}

     

       522
       522
       +
       

     

       513
       523
        
       		err = db.DeleteSpindle(

     

       514
       524
        
       			tx,

     

       515
       525
        
       			db.FilterEq("owner", did),

+12

appview/spindles/spindles.go

···

       303
       303
        
       		s.Enforcer.E.LoadPolicy()

     

       304
       304
        
       	}()

     

       305
       305
        
       

     

       306
       306
       +
       	// remove spindle members first

     

       307
       307
       +
       	err = db.RemoveSpindleMember(

     

       308
       308
       +
       		tx,

     

       309
       309
       +
       		db.FilterEq("did", user.Did),

     

       310
       310
       +
       		db.FilterEq("instance", instance),

     

       311
       311
       +
       	)

     

       312
       312
       +
       	if err != nil {

     

       313
       313
       +
       		l.Error("failed to remove spindle members", "err", err)

     

       314
       314
       +
       		fail()

     

       315
       315
       +
       		return

     

       316
       316
       +
       	}

     

       317
       317
       +
       

     

       306
       318
        
       	err = db.DeleteSpindle(

     

       307
       319
        
       		tx,

     

       308
       320
        
       		db.FilterEq("owner", user.Did),