refactor: Optimize query for achievement

Hidayatullah Wildan Ghaly Bucharyrequested to merge
Achievement-Refactor into main

Query is now better and readable

Merge request reports