Skip to content
This repository has been archived by the owner on Oct 14, 2024. It is now read-only.

Commit

Permalink
fix: resolve view table not working (#653)
Browse files Browse the repository at this point in the history
* fix: resolve view table not working

* chore: fix linting
  • Loading branch information
ramizpolic authored Jul 12, 2024
1 parent 1d11788 commit 53d0584
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 4 deletions.
6 changes: 2 additions & 4 deletions backend/pkg/database/id_view.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,17 @@ func (i *IDsViewHandler) GetIDs(params GetIDsParams, idsShouldMatch bool) ([]str
}

lookupIDColumnName := getIDViewColumnNameByIDType(params.LookupIDType)
filterIDColumnName := getIDViewColumnNameByIDType(params.FilterIDType)

// we will use Session(&gorm.Session{}) here so every call to the handler will start from scratch
tx := i.IDsView.
Session(&gorm.Session{}).
Select("distinct " + lookupIDColumnName)

filterIDColumnName := getIDViewColumnNameByIDType(params.FilterIDType)

if idsShouldMatch {
for _, id := range params.FilterIDs {
// for each OR filter we need to verify that lookup id column is not null to avoid failing during Find
tx.Or("? = ? AND ? is not null", filterIDColumnName, id,
lookupIDColumnName)
tx.Or(fmt.Sprintf("%s = ? AND %s is not null", filterIDColumnName, lookupIDColumnName), id)
}
} else {
for _, id := range params.FilterIDs {
Expand Down
65 changes: 65 additions & 0 deletions backend/pkg/database/id_view_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Copyright © 2024 Cisco Systems, Inc. and its affiliates.
// All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package database

import (
"testing"

"github.com/openclarity/kubeclarity/api/server/restapi/operations"
)

func TestIdView(t *testing.T) {
// prepare database
db := Init(&DBConfig{
EnableInfoLogs: false,
DriverType: DBDriverTypeLocal,
ViewRefreshIntervalSecond: 1,
})
db.CreateFakeData()

// fetch first application
sortDir := string("ASC")
apps, _, err := db.ApplicationTable().GetApplicationsAndTotal(GetApplicationsParams{
GetApplicationsParams: operations.GetApplicationsParams{
SortDir: &sortDir,
SortKey: "applicationName",
Page: 1,
PageSize: 1,
},
})
if err != nil || len(apps) != 1 {
t.Fatalf("expected one application")
}

// set application ID
appID := apps[0].ID

// fetch application from view table
appViewIDs, err := db.IDsView().GetIDs(
GetIDsParams{
FilterIDs: []string{appID},
FilterIDType: ApplicationIDType,
LookupIDType: ApplicationIDType,
},
true,
)
if err != nil || len(appViewIDs) != 1 {
t.Fatalf("expected one application from IDsView table")
}
if appViewIDs[0] != appID {
t.Fatalf("expected application ID from IDsView table to be same as ID from Applications table")
}
}

0 comments on commit 53d0584

Please sign in to comment.