Merge pull request #23 from qnib/dyndb_listitems

Dyndb listitems

Author: ChristianKniep

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.2.0
 commit = True
 tag = True
 

cmd/boltdb/main.go

@@ -29,7 +29,7 @@ func Log(handler http.Handler) http.Handler {
 func main() {
 	flag.Parse()
 	if *version {
-		fmt.Println(`v0.1.0`)
+		fmt.Println(`v0.2.0`)
 		os.Exit(0)
 	}
 	port := os.Getenv("PORT")

pkg/storage/dynamodb/machinetype_service.go

@@ -38,9 +38,6 @@ func (s *machineTypeService) GetByUsername(username string) (mt *storage.Machine
 	if err != nil {
 		return
 	}
-	log.Println("Found item:")
-	log.Println("Login:  ", user.Login)
-	log.Println("Password: ", user.Password)
 	mt = &storage.MachineType{
 		Login:    user.Login,
 		Password: user.Password,
@@ -50,9 +47,6 @@ func (s *machineTypeService) GetByUsername(username string) (mt *storage.Machine
 	if err != nil {
 		return
 	}
-	log.Println("Found item:")
-	log.Println("Type:  ", typ.Type)
-	log.Println("Featuresd: ", typ.Features)
 	mt.Features = strings.Split(typ.Features, ",")
 	mt.DisplayName = typ.Type
 	log.Printf("Return MT: %v", mt)
@@ -67,8 +61,19 @@ func (s *machineTypeService) Delete(accountName string, id int64) error {
 	return nil
 }
 
-func (s *machineTypeService) List(accountName string) (mt []storage.MachineType, err error) {
+func (s *machineTypeService) List(accountName string) (mts []storage.MachineType, err error) {
 	log.Printf("mt.List(accountName=%s)", accountName)
+	typeItems, err := mhTableTypeList(svc, fmt.Sprintf("%s_types", mhDbTablePrefix))
+	if err != nil {
+		return
+	}
+	for _, tItem := range typeItems {
+		mt := storage.MachineType{
+			DisplayName: tItem.Type,
+			Features:    strings.Split(tItem.Features, ","),
+		}
+		mts = append(mts, mt)
+	}
 	return
 }
 

pkg/storage/dynamodb/service.go

@@ -202,6 +202,20 @@ func mhTableUserScan(db *dynamodb.DynamoDB, tableName, usern string) (user Users
 	return
 }
 
+func mhTableTypeList(db *dynamodb.DynamoDB, tableName string) (typeItems []TypeItem, err error) {
+	log.Printf("List machine types in '%s'", tableName)
+	params := &dynamodb.ScanInput{
+		TableName: aws.String(tableName),
+	}
+	result, err := svc.Scan(params)
+	if err != nil {
+		fmt.Println(err.Error())
+		return
+	}
+	err = dynamodbattribute.UnmarshalListOfMaps(result.Items, &typeItems)
+	return
+}
+
 func mhTableTypeScan(db *dynamodb.DynamoDB, tableName, typen string) (typeItem TypeItem, err error) {
 	log.Printf("Search for type '%s' in '%s'", typen, tableName)
 	var queryInput = &dynamodb.QueryInput{