Add hamster tag management, reinstate tags during import, reorganise

code

hamstertools/db.py

@@ -8,6 +8,7 @@ from peewee import (
     DateTimeField,
     SmallIntegerField,
     BooleanField,
+    CompositeKey
 )
 
 
@@ -42,6 +43,25 @@ class HamsterFact(Model):
         table_name = "facts"
 
 
+class HamsterTag(Model):
+    name = CharField()
+
+    class Meta:
+        database = db
+        table_name = "tags"
+
+
+
+class HamsterFactTag(Model):
+    fact = ForeignKeyField(HamsterFact, backref="tags")
+    tag = ForeignKeyField(HamsterTag, backref="facts")
+
+    class Meta:
+        database = db
+        table_name = "fact_tags"
+        primary_key = CompositeKey('fact', 'tag')
+
+
 class KimaiCustomer(Model):
     visible = BooleanField(default=True)
     name = CharField()
@@ -72,6 +92,15 @@ class KimaiActivity(Model):
         table_name = "kimai_activities"
 
 
+class KimaiTag(Model):
+    name = CharField()
+    visible = BooleanField(default=True)
+
+    class Meta:
+        database = db
+        table_name = "kimai_tags"
+
+
 class HamsterActivityKimaiMapping(Model):
     hamster_activity = ForeignKeyField(HamsterActivity, backref="mappings")
     kimai_customer = ForeignKeyField(KimaiCustomer, backref="mappings")