Clean graphql

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>

pkg/server/api/console/v1/schema.graphql

@@ -1084,9 +1084,6 @@ type Mutation {
   updateOrganization(
     input: UpdateOrganizationInput!
   ): UpdateOrganizationPayload!
-  deleteOrganization(
-    input: DeleteOrganizationInput!
-  ): DeleteOrganizationPayload!
 
   # User mutations
   confirmEmail(input: ConfirmEmailInput!): ConfirmEmailPayload!
@@ -1210,14 +1207,10 @@ type Mutation {
   createAsset(input: CreateAssetInput!): CreateAssetPayload!
   updateAsset(input: UpdateAssetInput!): UpdateAssetPayload!
   deleteAsset(input: DeleteAssetInput!): DeleteAssetPayload!
-  addAssetVendor(input: AddAssetVendorInput!): AddAssetVendorPayload!
-  removeAssetVendor(input: RemoveAssetVendorInput!): RemoveAssetVendorPayload!
 
   createDatum(input: CreateDatumInput!): CreateDatumPayload!
   updateDatum(input: UpdateDatumInput!): UpdateDatumPayload!
   deleteDatum(input: DeleteDatumInput!): DeleteDatumPayload!
-  addDatumVendor(input: AddDatumVendorInput!): AddDatumVendorPayload!
-  removeDatumVendor(input: RemoveDatumVendorInput!): RemoveDatumVendorPayload!
 }
 
 # Input Types
@@ -1231,10 +1224,6 @@ input UpdateOrganizationInput {
   logo: Upload
 }
 
-input DeleteOrganizationInput {
-  organizationId: ID!
-}
-
 input CreateVendorInput {
   organizationId: ID!
   name: String!
@@ -1556,10 +1545,6 @@ type UpdateOrganizationPayload {
   organization: Organization!
 }
 
-type DeleteOrganizationPayload {
-  deletedOrganizationId: ID!
-}
-
 type CreateControlPayload {
   controlEdge: ControlEdge!
 }
@@ -2029,16 +2014,6 @@ input DeleteAssetInput {
   assetId: ID!
 }
 
-input AddAssetVendorInput {
-  assetId: ID!
-  vendorId: ID!
-}
-
-input RemoveAssetVendorInput {
-  assetId: ID!
-  vendorId: ID!
-}
-
 type CreateAssetPayload {
   assetEdge: AssetEdge!
 }
@@ -2051,14 +2026,6 @@ type DeleteAssetPayload {
   deletedAssetId: ID!
 }
 
-type AddAssetVendorPayload {
-  asset: Asset!
-}
-
-type RemoveAssetVendorPayload {
-  asset: Asset!
-}
-
 type Datum implements Node {
   id: ID!
   name: String!
@@ -2101,16 +2068,6 @@ input DeleteDatumInput {
   datumId: ID!
 }
 
-input AddDatumVendorInput {
-  datumId: ID!
-  vendorId: ID!
-}
-
-input RemoveDatumVendorInput {
-  datumId: ID!
-  vendorId: ID!
-}
-
 type CreateDatumPayload {
   datumEdge: DatumEdge!
 }
@@ -2122,11 +2079,3 @@ type UpdateDatumPayload {
 type DeleteDatumPayload {
   deletedDatumId: ID!
 }
-
-type AddDatumVendorPayload {
-  datum: Datum!
-}
-
-type RemoveDatumVendorPayload {
-  datum: Datum!
-}

pkg/server/api/console/v1/types/types.go

@@ -16,24 +16,6 @@ type Node interface {
 	GetID() gid.GID
 }
 
-type AddAssetVendorInput struct {
-	AssetID  gid.GID `json:"assetId"`
-	VendorID gid.GID `json:"vendorId"`
-}
-
-type AddAssetVendorPayload struct {
-	Asset *Asset `json:"asset"`
-}
-
-type AddDatumVendorInput struct {
-	DatumID  gid.GID `json:"datumId"`
-	VendorID gid.GID `json:"vendorId"`
-}
-
-type AddDatumVendorPayload struct {
-	Datum *Datum `json:"datum"`
-}
-
 type AssessVendorInput struct {
 	ID         gid.GID `json:"id"`
 	WebsiteURL string  `json:"websiteUrl"`
@@ -479,14 +461,6 @@ type DeleteMeasurePayload struct {
 	DeletedMeasureID gid.GID `json:"deletedMeasureId"`
 }
 
-type DeleteOrganizationInput struct {
-	OrganizationID gid.GID `json:"organizationId"`
-}
-
-type DeleteOrganizationPayload struct {
-	DeletedOrganizationID gid.GID `json:"deletedOrganizationId"`
-}
-
 type DeletePeopleInput struct {
 	PeopleID gid.GID `json:"peopleId"`
 }
@@ -858,24 +832,6 @@ type PublishDocumentVersionPayload struct {
 type Query struct {
 }
 
-type RemoveAssetVendorInput struct {
-	AssetID  gid.GID `json:"assetId"`
-	VendorID gid.GID `json:"vendorId"`
-}
-
-type RemoveAssetVendorPayload struct {
-	Asset *Asset `json:"asset"`
-}
-
-type RemoveDatumVendorInput struct {
-	DatumID  gid.GID `json:"datumId"`
-	VendorID gid.GID `json:"vendorId"`
-}
-
-type RemoveDatumVendorPayload struct {
-	Datum *Datum `json:"datum"`
-}
-
 type RemoveUserInput struct {
 	OrganizationID gid.GID `json:"organizationId"`
 	UserID         gid.GID `json:"userId"`

pkg/server/api/console/v1/v1_resolver.go

@@ -76,7 +76,18 @@ func (r *assetResolver) AssetType(ctx context.Context, obj *types.Asset) (coreda
 
 // Organization is the resolver for the organization field.
 func (r *assetResolver) Organization(ctx context.Context, obj *types.Asset) (*types.Organization, error) {
-	panic(fmt.Errorf("not implemented: Organization - organization"))
+	svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
+
+	if obj.Organization == nil {
+		return nil, fmt.Errorf("cannot get organization")
+	}
+
+	org, err := svc.Organizations.Get(ctx, obj.Organization.ID)
+	if err != nil {
+		return nil, fmt.Errorf("cannot get organization: %w", err)
+	}
+
+	return types.NewOrganization(org), nil
 }
 
 // Framework is the resolver for the framework field.
@@ -696,11 +707,6 @@ func (r *mutationResolver) UpdateOrganization(ctx context.Context, input types.U
 	}, nil
 }
 
-// DeleteOrganization is the resolver for the deleteOrganization field.
-func (r *mutationResolver) DeleteOrganization(ctx context.Context, input types.DeleteOrganizationInput) (*types.DeleteOrganizationPayload, error) {
-	panic(fmt.Errorf("not implemented: DeleteOrganization - deleteOrganization"))
-}
-
 // ConfirmEmail is the resolver for the confirmEmail field.
 func (r *mutationResolver) ConfirmEmail(ctx context.Context, input types.ConfirmEmailInput) (*types.ConfirmEmailPayload, error) {
 	err := r.usrmgrSvc.ConfirmEmail(ctx, input.Token)
@@ -1833,16 +1839,6 @@ func (r *mutationResolver) DeleteAsset(ctx context.Context, input types.DeleteAs
 	}, nil
 }
 
-// AddAssetVendor is the resolver for the addAssetVendor field.
-func (r *mutationResolver) AddAssetVendor(ctx context.Context, input types.AddAssetVendorInput) (*types.AddAssetVendorPayload, error) {
-	panic(fmt.Errorf("not implemented: AddAssetVendor - addAssetVendor"))
-}
-
-// RemoveAssetVendor is the resolver for the removeAssetVendor field.
-func (r *mutationResolver) RemoveAssetVendor(ctx context.Context, input types.RemoveAssetVendorInput) (*types.RemoveAssetVendorPayload, error) {
-	panic(fmt.Errorf("not implemented: RemoveAssetVendor - removeAssetVendor"))
-}
-
 // CreateDatum is the resolver for the createDatum field.
 func (r *mutationResolver) CreateDatum(ctx context.Context, input types.CreateDatumInput) (*types.CreateDatumPayload, error) {
 	svc := GetTenantService(ctx, r.proboSvc, input.OrganizationID.TenantID())
@@ -1898,16 +1894,6 @@ func (r *mutationResolver) DeleteDatum(ctx context.Context, input types.DeleteDa
 	}, nil
 }
 
-// AddDatumVendor is the resolver for the addDatumVendor field.
-func (r *mutationResolver) AddDatumVendor(ctx context.Context, input types.AddDatumVendorInput) (*types.AddDatumVendorPayload, error) {
-	panic(fmt.Errorf("not implemented: AddDatumVendor - addDatumVendor"))
-}
-
-// RemoveDatumVendor is the resolver for the removeDatumVendor field.
-func (r *mutationResolver) RemoveDatumVendor(ctx context.Context, input types.RemoveDatumVendorInput) (*types.RemoveDatumVendorPayload, error) {
-	panic(fmt.Errorf("not implemented: RemoveDatumVendor - removeDatumVendor"))
-}
-
 // LogoURL is the resolver for the logoUrl field.
 func (r *organizationResolver) LogoURL(ctx context.Context, obj *types.Organization) (*string, error) {
 	svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())