Fixed conflicts

pythonhacker · pythonhacker · commit 571c914eed30 · 2023-07-29T13:39:13.000+05:30
diff --git a/db.go b/db.go
@@ -30,6 +30,33 @@ type Entry struct {
     Tags      string    `gorm:"column:tags"`
     Type      string    `gorm:"column:type"`  // Entry type, default/card/ID
     Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+
+// 	ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
+// 	Type      string    `gorm:"column:type"`  // Type of entry - password (default), card, identity etc
+// 	Title     string    `gorm:"column:title"`
+//     Name      string    `gorm:"column:name"` // Card holder name/ID card name - for types cards/identity
+//   	Company   string    `gorm:"column:company"` // Company name of person  - for type identity and
+//                                              	// Credit card company for type CC
+// 	Number    string    `gorm:"column:number"`  // Number type - CC number for credit cards
+// 	                                            // ID card number for identity types
+// 	SecurityCode string  `gorm:"security_code"` // CVV number/security code for CC type
+// 	ExpiryMonth string   `gorm:"expiry_month"` // CC or Identity document expiry month
+// 	ExpiryDay string     `gorm:"expiry_day"`   // Identity document expiry day
+// 	ExpiryYear string    `gorm:"expiry_year"`  // CC or Identity document expiry year
+// 	FirstName  string    `gorm:"column:first_name"` // first name - for ID card types
+// 	MiddleName string    `gorm:"column:middle_name"` // middle name - for ID card types
+// 	LastName   string    `gorm:"column:last_name"` // last name - for ID card types	
+// 	Email      string    `gorm:"email"` // Email - for ID card types
+// 	PhoneNumber string   `gorm:"phone_number"` // Phone number - for ID card types
+
+// 	Active    bool       `gorm:"active;default:true"` // Is the id card/CC active ?
+// 	User      string    `gorm:"column:user"`
+// 	Url       string    `gorm:"column:url"`
+// 	Password  string    `gorm:"column:password"`
+// 	Notes     string    `gorm:"column:notes"`
+// 	Tags      string    `gorm:"column:tags"`
+// 	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+
 }
 
     
@@ -52,16 +79,68 @@ func (ex *ExtendedEntry) TableName() string {
     return "exentries"
 }
 
+type Address struct {
+	ID     int   `gorm:"column:id;autoIncrement;primaryKey"`
+	Number string `gorm:"column:number"` // Flat or building number
+	Building string `gorm:"column:building"` // Apartment or building or society name
+	Street  string `gorm:"column:street"` // Street address
+	Locality string `gorm:"column:locality"` // Name of the locality e.g: Whitefield
+	Area     string `gorm:"column:area"` // Name of the larger area e.g: East Bangalore
+	City     string `gorm:"column:city"` // Name of the city e.g: Bangalore
+	State   string  `gorm:"column:state"` // Name of the state e.g: Karnataka
+	Country string  `gorm:"column:country"` // Name of the country e.g: India
+
+	Landmark string `gorm:"column:landmark"` // Name of landmark if any
+	ZipCode string  `gorm:"column:zipcode"` // PIN/ZIP code
+	Type    string  `gorm:"column:type"` // Type of address: Home/Work/Business
+
+	Entry   Entry `gorm:"foreignKey:EntryID"`
+	EntryID int	
+}
+
+func (ad *Address) TableName() string {
+	return "address"
+}
+
 // Clone an entry
 func (e1 *Entry) Copy(e2 *Entry) {
 
-    if e2 != nil {
-        e1.Title = e2.Title
-        e1.User = e2.User
-        e1.Url = e2.Url
-        e1.Password = e2.Password
-        e1.Notes = e2.Notes
-    }
+	if e2 != nil {
+		switch (e2.Type) {
+		case "password":
+			e1.Title = e2.Title
+			e1.User = e2.User
+			e1.Url = e2.Url
+			e1.Password = e2.Password
+			e1.Notes = e2.Notes
+			e1.Tags = e2.Tags
+			e1.Type = e2.Type
+		case "card":
+			e1.Title = e2.Title
+			e1.User = e2.User // card holder name
+			e1.Issuer = e2.Issuer
+			e1.Url = e2.Url
+			e1.Password = e2.Password
+			e1.ExpiryDate = e2.ExpiryDate
+			e1.Tags = e2.Tags
+			e1.Notes = e2.Notes
+			e1.Type = e2.Type			
+		// case "identity":
+		// 	e1.Title = e2.Title
+		// 	e1.Name = e2.Name 
+		// 	e1.Company = e2.Company
+		// 	e1.FirstName = e2.FirstName
+		// 	e1.LastName = e2.LastName			
+		// 	e1.MiddleName = e2.MiddleName
+		// 	e1.User = e2.User
+		// 	e1.Email = e2.Email
+		// 	e1.PhoneNumber = e2.PhoneNumber
+		// 	e1.Number = e2.Number
+		// 	e1.Notes = e2.Notes
+		// 	e1.Tags = e2.Tags
+		// 	e1.Type = e2.Type
+		}
+	}
 }
 
 // Clone an entry
