rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove criticity on assets

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2025-10-13 22:06:49 +02:00
parent 344b340d1a
commit f808a90bba
22 changed files with 71 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/server/api/console/v1/schema.graphql
View File

@@ -952,17 +952,6 @@ enum AssetType
@goEnum(value: "github.com/getprobo/probo/pkg/coredata.AssetTypeVirtual")
}
enum CriticityLevel
@goModel(model: "github.com/getprobo/probo/pkg/coredata.CriticityLevel") {
LOW @goEnum(value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelLow")
MEDIUM
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelMedium"
)
HIGH
@goEnum(value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelHigh")
}
enum AssetOrderField
@goModel(model: "github.com/getprobo/probo/pkg/coredata.AssetOrderField") {
CREATED_AT
@@ -973,10 +962,6 @@ enum AssetOrderField
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.AssetOrderFieldAmount"
)
CRITICITY
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.AssetOrderFieldCriticity"
)
}
enum DatumOrderField
@@ -4216,7 +4201,6 @@ type Asset implements Node {
before: CursorKey
orderBy: VendorOrder
): VendorConnection! @goField(forceResolver: true)
criticity: CriticityLevel!
assetType: AssetType! @goField(forceResolver: true)
dataTypesStored: String!
organization: Organization! @goField(forceResolver: true)
@@ -4251,7 +4235,6 @@ input CreateAssetInput {
name: String!
amount: Int!
ownerId: ID!
criticity: CriticityLevel! = MEDIUM
assetType: AssetType!
dataTypesStored: String!
vendorIds: [ID!]
@@ -4262,7 +4245,6 @@ input UpdateAssetInput {
name: String
amount: Int
ownerId: ID
criticity: CriticityLevel
assetType: AssetType
dataTypesStored: String
vendorIds: [ID!]

166
pkg/server/api/console/v1/schema/schema.go
View File

@@ -113,7 +113,6 @@ type ComplexityRoot struct {
Amount func(childComplexity int) int
AssetType func(childComplexity int) int
CreatedAt func(childComplexity int) int
Criticity func(childComplexity int) int
DataTypesStored func(childComplexity int) int
ID func(childComplexity int) int
Name func(childComplexity int) int
@@ -1579,7 +1578,6 @@ type ComplexityRoot struct {
type AssetResolver interface {
Owner(ctx context.Context, obj *types.Asset) (*types.People, error)
Vendors(ctx context.Context, obj *types.Asset, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.VendorOrderBy) (*types.VendorConnection, error)
AssetType(ctx context.Context, obj *types.Asset) (coredata.AssetType, error)
Organization(ctx context.Context, obj *types.Asset) (*types.Organization, error)
@@ -1996,13 +1994,6 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin
return e.complexity.Asset.CreatedAt(childComplexity), true
case "Asset.criticity":
if e.complexity.Asset.Criticity == nil {
break
}
return e.complexity.Asset.Criticity(childComplexity), true
case "Asset.dataTypesStored":
if e.complexity.Asset.DataTypesStored == nil {
break
@@ -9669,17 +9660,6 @@ enum AssetType
@goEnum(value: "github.com/getprobo/probo/pkg/coredata.AssetTypeVirtual")
}
enum CriticityLevel
@goModel(model: "github.com/getprobo/probo/pkg/coredata.CriticityLevel") {
LOW @goEnum(value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelLow")
MEDIUM
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelMedium"
)
HIGH
@goEnum(value: "github.com/getprobo/probo/pkg/coredata.CriticityLevelHigh")
}
enum AssetOrderField
@goModel(model: "github.com/getprobo/probo/pkg/coredata.AssetOrderField") {
CREATED_AT
@@ -9690,10 +9670,6 @@ enum AssetOrderField
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.AssetOrderFieldAmount"
)
CRITICITY
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.AssetOrderFieldCriticity"
)
}
enum DatumOrderField
@@ -12933,7 +12909,6 @@ type Asset implements Node {
before: CursorKey
orderBy: VendorOrder
): VendorConnection! @goField(forceResolver: true)
criticity: CriticityLevel!
assetType: AssetType! @goField(forceResolver: true)
dataTypesStored: String!
organization: Organization! @goField(forceResolver: true)
@@ -12968,7 +12943,6 @@ input CreateAssetInput {
name: String!
amount: Int!
ownerId: ID!
criticity: CriticityLevel! = MEDIUM
assetType: AssetType!
dataTypesStored: String!
vendorIds: [ID!]
@@ -12979,7 +12953,6 @@ input UpdateAssetInput {
name: String
amount: Int
ownerId: ID
criticity: CriticityLevel
assetType: AssetType
dataTypesStored: String
vendorIds: [ID!]
@@ -21413,50 +21386,6 @@ func (ec *executionContext) fieldContext_Asset_vendors(ctx context.Context, fiel
return fc, nil
}
func (ec *executionContext) _Asset_criticity(ctx context.Context, field graphql.CollectedField, obj *types.Asset) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_Asset_criticity(ctx, field)
if err != nil {
return graphql.Null
}
ctx = graphql.WithFieldContext(ctx, fc)
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
ctx = rctx // use context from middleware stack in children
return obj.Criticity, nil
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
res := resTmp.(coredata.CriticityLevel)
fc.Result = res
return ec.marshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx, field.Selections, res)
}
func (ec *executionContext) fieldContext_Asset_criticity(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
fc = &graphql.FieldContext{
Object: "Asset",
Field: field,
IsMethod: false,
IsResolver: false,
Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
return nil, errors.New("field of type CriticityLevel does not have child fields")
},
}
return fc, nil
}
func (ec *executionContext) _Asset_assetType(ctx context.Context, field graphql.CollectedField, obj *types.Asset) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_Asset_assetType(ctx, field)
if err != nil {
@@ -21980,8 +21909,6 @@ func (ec *executionContext) fieldContext_AssetEdge_node(_ context.Context, field
return ec.fieldContext_Asset_owner(ctx, field)
case "vendors":
return ec.fieldContext_Asset_vendors(ctx, field)
case "criticity":
return ec.fieldContext_Asset_criticity(ctx, field)
case "assetType":
return ec.fieldContext_Asset_assetType(ctx, field)
case "dataTypesStored":
@@ -55737,8 +55664,6 @@ func (ec *executionContext) fieldContext_UpdateAssetPayload_asset(_ context.Cont
return ec.fieldContext_Asset_owner(ctx, field)
case "vendors":
return ec.fieldContext_Asset_vendors(ctx, field)
case "criticity":
return ec.fieldContext_Asset_criticity(ctx, field)
case "assetType":
return ec.fieldContext_Asset_assetType(ctx, field)
case "dataTypesStored":
@@ -66053,11 +65978,7 @@ func (ec *executionContext) unmarshalInputCreateAssetInput(ctx context.Context,
asMap[k] = v
}
if _, present := asMap["criticity"]; !present {
asMap["criticity"] = "MEDIUM"
}
fieldsInOrder := [...]string{"organizationId", "name", "amount", "ownerId", "criticity", "assetType", "dataTypesStored", "vendorIds"}
fieldsInOrder := [...]string{"organizationId", "name", "amount", "ownerId", "assetType", "dataTypesStored", "vendorIds"}
for _, k := range fieldsInOrder {
v, ok := asMap[k]
if !ok {
@@ -66092,13 +66013,6 @@ func (ec *executionContext) unmarshalInputCreateAssetInput(ctx context.Context,
return it, err
}
it.OwnerID = data
case "criticity":
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("criticity"))
data, err := ec.unmarshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx, v)
if err != nil {
return it, err
}
it.Criticity = data
case "assetType":
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("assetType"))
data, err := ec.unmarshalNAssetType2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐAssetType(ctx, v)
@@ -70385,7 +70299,7 @@ func (ec *executionContext) unmarshalInputUpdateAssetInput(ctx context.Context,
asMap[k] = v
}
fieldsInOrder := [...]string{"id", "name", "amount", "ownerId", "criticity", "assetType", "dataTypesStored", "vendorIds"}
fieldsInOrder := [...]string{"id", "name", "amount", "ownerId", "assetType", "dataTypesStored", "vendorIds"}
for _, k := range fieldsInOrder {
v, ok := asMap[k]
if !ok {
@@ -70420,13 +70334,6 @@ func (ec *executionContext) unmarshalInputUpdateAssetInput(ctx context.Context,
return it, err
}
it.OwnerID = data
case "criticity":
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("criticity"))
data, err := ec.unmarshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx, v)
if err != nil {
return it, err
}
it.Criticity = data
case "assetType":
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("assetType"))
data, err := ec.unmarshalOAssetType2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐAssetType(ctx, v)
@@ -72933,11 +72840,6 @@ func (ec *executionContext) _Asset(ctx context.Context, sel ast.SelectionSet, ob
}
out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) })
case "criticity":
out.Values[i] = ec._Asset_criticity(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&out.Invalids, 1)
}
case "assetType":
field := field
@@ -88716,12 +88618,10 @@ var (
unmarshalNAssetOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐAssetOrderField = map[string]coredata.AssetOrderField{
"CREATED_AT": coredata.AssetOrderFieldCreatedAt,
"AMOUNT": coredata.AssetOrderFieldAmount,
"CRITICITY": coredata.AssetOrderFieldCriticity,
}
marshalNAssetOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐAssetOrderField = map[coredata.AssetOrderField]string{
coredata.AssetOrderFieldCreatedAt: "CREATED_AT",
coredata.AssetOrderFieldAmount: "AMOUNT",
coredata.AssetOrderFieldCriticity: "CRITICITY",
}
)
@@ -91181,36 +91081,6 @@ func (ec *executionContext) marshalNCreateVendorServicePayload2ᚖgithubᚗcom
return ec._CreateVendorServicePayload(ctx, sel, v)
}
func (ec *executionContext) unmarshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx context.Context, v any) (coredata.CriticityLevel, error) {
tmp, err := graphql.UnmarshalString(v)
res := unmarshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel[tmp]
return res, graphql.ErrorOnPath(ctx, err)
}
func (ec *executionContext) marshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx context.Context, sel ast.SelectionSet, v coredata.CriticityLevel) graphql.Marshaler {
_ = sel
res := graphql.MarshalString(marshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel[v])
if res == graphql.Null {
if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
ec.Errorf(ctx, "the requested element is null which the schema does not allow")
}
}
return res
}
var (
unmarshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel = map[string]coredata.CriticityLevel{
"LOW": coredata.CriticityLevelLow,
"MEDIUM": coredata.CriticityLevelMedium,
"HIGH": coredata.CriticityLevelHigh,
}
marshalNCriticityLevel2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel = map[coredata.CriticityLevel]string{
coredata.CriticityLevelLow: "LOW",
coredata.CriticityLevelMedium: "MEDIUM",
coredata.CriticityLevelHigh: "HIGH",
}
)
func (ec *executionContext) unmarshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, v any) (page.CursorKey, error) {
res, err := cursor.UnmarshalCursorKeyScalar(v)
return res, graphql.ErrorOnPath(ctx, err)
@@ -97415,38 +97285,6 @@ var (
}
)
func (ec *executionContext) unmarshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx context.Context, v any) (*coredata.CriticityLevel, error) {
if v == nil {
return nil, nil
}
tmp, err := graphql.UnmarshalString(v)
res := unmarshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel[tmp]
return &res, graphql.ErrorOnPath(ctx, err)
}
func (ec *executionContext) marshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel(ctx context.Context, sel ast.SelectionSet, v *coredata.CriticityLevel) graphql.Marshaler {
if v == nil {
return graphql.Null
}
_ = sel
_ = ctx
res := graphql.MarshalString(marshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel[*v])
return res
}
var (
unmarshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel = map[string]coredata.CriticityLevel{
"LOW": coredata.CriticityLevelLow,
"MEDIUM": coredata.CriticityLevelMedium,
"HIGH": coredata.CriticityLevelHigh,
}
marshalOCriticityLevel2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐCriticityLevel = map[coredata.CriticityLevel]string{
coredata.CriticityLevelLow: "LOW",
coredata.CriticityLevelMedium: "MEDIUM",
coredata.CriticityLevelHigh: "HIGH",
}
)
func (ec *executionContext) unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, v any) (*page.CursorKey, error) {
if v == nil {
return nil, nil

1
pkg/server/api/console/v1/types/asset.go
View File

@@ -47,7 +47,6 @@ func NewAsset(asset *coredata.Asset) *Asset {
SnapshotID: asset.SnapshotID,
Name: asset.Name,
Amount: asset.Amount,
Criticity: asset.Criticity,
AssetType: asset.AssetType,
DataTypesStored: asset.DataTypesStored,
CreatedAt: asset.CreatedAt,

53
pkg/server/api/console/v1/types/types.go
View File

@@ -26,18 +26,17 @@ type AssessVendorPayload struct {
}
type Asset struct {
ID gid.GID `json:"id"`
SnapshotID *gid.GID `json:"snapshotId,omitempty"`
Name string `json:"name"`
Amount int `json:"amount"`
Owner *People `json:"owner"`
Vendors *VendorConnection `json:"vendors"`
Criticity coredata.CriticityLevel `json:"criticity"`
AssetType coredata.AssetType `json:"assetType"`
DataTypesStored string `json:"dataTypesStored"`
Organization *Organization `json:"organization"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
ID gid.GID `json:"id"`
SnapshotID *gid.GID `json:"snapshotId,omitempty"`
Name string `json:"name"`
Amount int `json:"amount"`
Owner *People `json:"owner"`
Vendors *VendorConnection `json:"vendors"`
AssetType coredata.AssetType `json:"assetType"`
DataTypesStored string `json:"dataTypesStored"`
Organization *Organization `json:"organization"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
func (Asset) IsNode() {}
@@ -222,14 +221,13 @@ type ControlFilter struct {
}
type CreateAssetInput struct {
OrganizationID gid.GID `json:"organizationId"`
Name string `json:"name"`
Amount int `json:"amount"`
OwnerID gid.GID `json:"ownerId"`
Criticity coredata.CriticityLevel `json:"criticity"`
AssetType coredata.AssetType `json:"assetType"`
DataTypesStored string `json:"dataTypesStored"`
VendorIds []gid.GID `json:"vendorIds,omitempty"`
OrganizationID gid.GID `json:"organizationId"`
Name string `json:"name"`
Amount int `json:"amount"`
OwnerID gid.GID `json:"ownerId"`
AssetType coredata.AssetType `json:"assetType"`
DataTypesStored string `json:"dataTypesStored"`
VendorIds []gid.GID `json:"vendorIds,omitempty"`
}
type CreateAssetPayload struct {
@@ -1652,14 +1650,13 @@ type UnassignTaskPayload struct {
}
type UpdateAssetInput struct {
ID gid.GID `json:"id"`
Name *string `json:"name,omitempty"`
Amount *int `json:"amount,omitempty"`
OwnerID *gid.GID `json:"ownerId,omitempty"`
Criticity *coredata.CriticityLevel `json:"criticity,omitempty"`
AssetType *coredata.AssetType `json:"assetType,omitempty"`
DataTypesStored *string `json:"dataTypesStored,omitempty"`
VendorIds []gid.GID `json:"vendorIds,omitempty"`
ID gid.GID `json:"id"`
Name *string `json:"name,omitempty"`
Amount *int `json:"amount,omitempty"`
OwnerID *gid.GID `json:"ownerId,omitempty"`
AssetType *coredata.AssetType `json:"assetType,omitempty"`
DataTypesStored *string `json:"dataTypesStored,omitempty"`
VendorIds []gid.GID `json:"vendorIds,omitempty"`
}
type UpdateAssetPayload struct {

2
pkg/server/api/console/v1/v1_resolver.go
View File

@@ -2794,7 +2794,6 @@ func (r *mutationResolver) CreateAsset(ctx context.Context, input types.CreateAs
Name: input.Name,
Amount: input.Amount,
OwnerID: input.OwnerID,
Criticity: input.Criticity,
AssetType: input.AssetType,
DataTypesStored: input.DataTypesStored,
VendorIDs: input.VendorIds,
@@ -2818,7 +2817,6 @@ func (r *mutationResolver) UpdateAsset(ctx context.Context, input types.UpdateAs
Name: input.Name,
Amount: input.Amount,
OwnerID: input.OwnerID,
Criticity: input.Criticity,
AssetType: input.AssetType,
DataTypesStored: input.DataTypesStored,
VendorIDs: input.VendorIds,