Removed aggregateId and replaced it with aggregateType

- Removed aggregateId and replaced it with aggregateType
- Improved code readability
- Remember to update column in database from aggregateid to aggregatetype